aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-04-05 20:58:09 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-04-09 13:56:42 -0400
commitb55b4b7a109f218fc25b9451934ff4d9100e691c (patch)
tree695462ae5e45314040ab38ac35f27cfaf1f757e3
parentdaacd5b27f8d5b19ea65dc4ad9929c94c0ef3e35 (diff)
[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>
-rw-r--r--drivers/media/dvb/dvb-usb/af9035.c16
1 files changed, 8 insertions, 8 deletions
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:
932} 932}
933 933
934enum af9035_id_entry { 934enum af9035_id_entry {
935 AF9035_0CCD_0093,
936 AF9035_15A4_9035, 935 AF9035_15A4_9035,
937 AF9035_15A4_1001, 936 AF9035_15A4_1001,
937 AF9035_0CCD_0093,
938 AF9035_07CA_A835, 938 AF9035_07CA_A835,
939 AF9035_07CA_B835, 939 AF9035_07CA_B835,
940 AF9035_07CA_1867, 940 AF9035_07CA_1867,
@@ -943,12 +943,12 @@ enum af9035_id_entry {
943}; 943};
944 944
945static struct usb_device_id af9035_id[] = { 945static struct usb_device_id af9035_id[] = {
946 [AF9035_0CCD_0093] = {
947 USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)},
948 [AF9035_15A4_9035] = { 946 [AF9035_15A4_9035] = {
949 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)}, 947 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)},
950 [AF9035_15A4_1001] = { 948 [AF9035_15A4_1001] = {
951 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)}, 949 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)},
950 [AF9035_0CCD_0093] = {
951 USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)},
952 [AF9035_07CA_A835] = { 952 [AF9035_07CA_A835] = {
953 USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A835)}, 953 USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A835)},
954 [AF9035_07CA_B835] = { 954 [AF9035_07CA_B835] = {
@@ -1004,15 +1004,15 @@ static struct dvb_usb_device_properties af9035_properties[] = {
1004 .num_device_descs = 5, 1004 .num_device_descs = 5,
1005 .devices = { 1005 .devices = {
1006 { 1006 {
1007 .name = "TerraTec Cinergy T Stick", 1007 .name = "Afatech AF9035 reference design",
1008 .cold_ids = { 1008 .cold_ids = {
1009 &af9035_id[AF9035_0CCD_0093], 1009 &af9035_id[AF9035_15A4_9035],
1010 &af9035_id[AF9035_15A4_1001],
1010 }, 1011 },
1011 }, { 1012 }, {
1012 .name = "Afatech Technologies DVB-T stick", 1013 .name = "TerraTec Cinergy T Stick",
1013 .cold_ids = { 1014 .cold_ids = {
1014 &af9035_id[AF9035_15A4_9035], 1015 &af9035_id[AF9035_0CCD_0093],
1015 &af9035_id[AF9035_15A4_1001],
1016 }, 1016 },
1017 }, { 1017 }, {
1018 .name = "AVerMedia AVerTV Volar HD/PRO (A835)", 1018 .name = "AVerMedia AVerTV Volar HD/PRO (A835)",