From: Antti Palosaari <crope@iki.fi>
Date: Fri, 6 Apr 2012 00:58:09 +0000 (-0300)
Subject: [media] af9035: reorganise USB ID and device list
X-Git-Tag: firefly_0821_release~3680^2~275^2~2506
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b55b4b7a109f218fc25b9451934ff4d9100e691c;p=firefly-linux-kernel-4.4.55.git

[media] af9035: reorganise USB ID and device list

Add and rename "Afatech AF9035 reference design" as a first
device in the list since it sounds logical to keep reference
design IDs on top of the list.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/dvb-usb/af9035.c b/drivers/media/dvb/dvb-usb/af9035.c
index e822706629db..9f962428368c 100644
--- a/drivers/media/dvb/dvb-usb/af9035.c
+++ b/drivers/media/dvb/dvb-usb/af9035.c
@@ -932,9 +932,9 @@ err:
 }
 
 enum af9035_id_entry {
-	AF9035_0CCD_0093,
 	AF9035_15A4_9035,
 	AF9035_15A4_1001,
+	AF9035_0CCD_0093,
 	AF9035_07CA_A835,
 	AF9035_07CA_B835,
 	AF9035_07CA_1867,
@@ -943,12 +943,12 @@ enum af9035_id_entry {
 };
 
 static struct usb_device_id af9035_id[] = {
-	[AF9035_0CCD_0093] = {
-		USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)},
 	[AF9035_15A4_9035] = {
 		USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)},
 	[AF9035_15A4_1001] = {
 		USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)},
+	[AF9035_0CCD_0093] = {
+		USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)},
 	[AF9035_07CA_A835] = {
 		USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A835)},
 	[AF9035_07CA_B835] = {
@@ -1004,15 +1004,15 @@ static struct dvb_usb_device_properties af9035_properties[] = {
 		.num_device_descs = 5,
 		.devices = {
 			{
-				.name = "TerraTec Cinergy T Stick",
+				.name = "Afatech AF9035 reference design",
 				.cold_ids = {
-					&af9035_id[AF9035_0CCD_0093],
+					&af9035_id[AF9035_15A4_9035],
+					&af9035_id[AF9035_15A4_1001],
 				},
 			}, {
-				.name = "Afatech Technologies DVB-T stick",
+				.name = "TerraTec Cinergy T Stick",
 				.cold_ids = {
-					&af9035_id[AF9035_15A4_9035],
-					&af9035_id[AF9035_15A4_1001],
+					&af9035_id[AF9035_0CCD_0093],
 				},
 			}, {
 				.name = "AVerMedia AVerTV Volar HD/PRO (A835)",