diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dibusb-mb.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-mb.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c index 828b5182e16c..c9f3e90ee25f 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-mb.c +++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c | |||
@@ -126,10 +126,12 @@ static struct usb_device_id dibusb_dib3000mb_table [] = { | |||
126 | /* 25 */ { USB_DEVICE(USB_VID_KYE, USB_PID_KYE_DVB_T_COLD) }, | 126 | /* 25 */ { USB_DEVICE(USB_VID_KYE, USB_PID_KYE_DVB_T_COLD) }, |
127 | /* 26 */ { USB_DEVICE(USB_VID_KYE, USB_PID_KYE_DVB_T_WARM) }, | 127 | /* 26 */ { USB_DEVICE(USB_VID_KYE, USB_PID_KYE_DVB_T_WARM) }, |
128 | 128 | ||
129 | /* 27 */ { USB_DEVICE(USB_VID_KWORLD, USB_PID_KWORLD_VSTREAM_COLD) }, | ||
130 | |||
129 | // #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs | 131 | // #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs |
130 | 132 | ||
131 | #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs | 133 | #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs |
132 | /* 27 */ { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) }, | 134 | /* 28 */ { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) }, |
133 | #endif | 135 | #endif |
134 | { } /* Terminating entry */ | 136 | { } /* Terminating entry */ |
135 | }; | 137 | }; |
@@ -262,7 +264,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = { | |||
262 | }, | 264 | }, |
263 | #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs | 265 | #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs |
264 | { "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)", | 266 | { "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)", |
265 | { &dibusb_dib3000mb_table[27], NULL }, | 267 | { &dibusb_dib3000mb_table[28], NULL }, |
266 | { NULL }, | 268 | { NULL }, |
267 | }, | 269 | }, |
268 | #endif | 270 | #endif |
@@ -306,12 +308,16 @@ static struct dvb_usb_properties dibusb2_0b_properties = { | |||
306 | } | 308 | } |
307 | }, | 309 | }, |
308 | 310 | ||
309 | .num_device_descs = 1, | 311 | .num_device_descs = 2, |
310 | .devices = { | 312 | .devices = { |
311 | { "KWorld/ADSTech Instant DVB-T USB 2.0", | 313 | { "KWorld/ADSTech Instant DVB-T USB2.0", |
312 | { &dibusb_dib3000mb_table[23], NULL }, | 314 | { &dibusb_dib3000mb_table[23], NULL }, |
313 | { &dibusb_dib3000mb_table[24], NULL }, | 315 | { &dibusb_dib3000mb_table[24], NULL }, |
314 | }, | 316 | }, |
317 | { "KWorld Xpert DVB-T USB2.0", | ||
318 | { &dibusb_dib3000mb_table[27], NULL }, | ||
319 | { NULL } | ||
320 | }, | ||
315 | } | 321 | } |
316 | }; | 322 | }; |
317 | 323 | ||