Commit 1e13c8f0 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Mauro Carvalho Chehab

V4L/DVB (13050): DIB0700: fix-up USB device ID for Terratec/Leadtek

git commit db48138f changed by accident the
assignment of certain USB IDs to their device-specific-handlers.

Thanks to Edward Sheldrake for finding this regression
Signed-off-by: default avatarPatrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2b5d9946
...@@ -1925,7 +1925,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { ...@@ -1925,7 +1925,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
{ NULL }, { NULL },
}, },
{ "Leadtek Winfast DTV Dongle (STK7700P based)", { "Leadtek Winfast DTV Dongle (STK7700P based)",
{ &dib0700_usb_id_table[8] }, { &dib0700_usb_id_table[8], &dib0700_usb_id_table[34] },
{ NULL }, { NULL },
}, },
{ "AVerMedia AVerTV DVB-T Express", { "AVerMedia AVerTV DVB-T Express",
...@@ -2064,7 +2064,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { ...@@ -2064,7 +2064,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
}, },
}, },
.num_device_descs = 12, .num_device_descs = 11,
.devices = { .devices = {
{ "DiBcom STK7070P reference design", { "DiBcom STK7070P reference design",
{ &dib0700_usb_id_table[15], NULL }, { &dib0700_usb_id_table[15], NULL },
...@@ -2098,11 +2098,6 @@ struct dvb_usb_device_properties dib0700_devices[] = { ...@@ -2098,11 +2098,6 @@ struct dvb_usb_device_properties dib0700_devices[] = {
{ &dib0700_usb_id_table[30], NULL }, { &dib0700_usb_id_table[30], NULL },
{ NULL }, { NULL },
}, },
{ "Terratec Cinergy T USB XXS/ T3",
{ &dib0700_usb_id_table[33],
&dib0700_usb_id_table[52], NULL },
{ NULL },
},
{ "Elgato EyeTV DTT", { "Elgato EyeTV DTT",
{ &dib0700_usb_id_table[49], NULL }, { &dib0700_usb_id_table[49], NULL },
{ NULL }, { NULL },
...@@ -2343,8 +2338,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { ...@@ -2343,8 +2338,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
{ &dib0700_usb_id_table[59], NULL }, { &dib0700_usb_id_table[59], NULL },
{ NULL }, { NULL },
}, },
{ "Terratec Cinergy T USB XXS (HD)", { "Terratec Cinergy T USB XXS (HD)/ T3",
{ &dib0700_usb_id_table[34], &dib0700_usb_id_table[60] }, { &dib0700_usb_id_table[33],
&dib0700_usb_id_table[52],
&dib0700_usb_id_table[60], NULL},
{ NULL }, { NULL },
}, },
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment