aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJohannes Stezenbach <js@linuxtv.org>2005-07-07 20:58:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:23:59 -0400
commit68293ddbabb26a58ddb0a84aa5058a7acd7127e7 (patch)
tree7cf1f8862b5df9fcb16585858e6226e5ab00b02d /drivers/media
parent53936391741dee735304e997e2289500adf970c7 (diff)
[PATCH] dvb: dvb-usb: support Artect T1 with broken USB ids
Add #define for device with broken USB ids. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dibusb-mb.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index a0ffbb59fa14..494e1227cb7e 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -115,6 +115,12 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
115/* 22 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_WARM) }, 115/* 22 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
116/* 23 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_COLD) }, 116/* 23 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_COLD) },
117/* 24 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_WARM) }, 117/* 24 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_WARM) },
118
119// #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
120
121#ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
122/* 25 */ { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
123#endif
118 { } /* Terminating entry */ 124 { } /* Terminating entry */
119}; 125};
120MODULE_DEVICE_TABLE (usb, dibusb_dib3000mb_table); 126MODULE_DEVICE_TABLE (usb, dibusb_dib3000mb_table);
@@ -228,12 +234,22 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
228 } 234 }
229 }, 235 },
230 236
237#ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
238 .num_device_descs = 2,
239#else
231 .num_device_descs = 1, 240 .num_device_descs = 1,
241#endif
232 .devices = { 242 .devices = {
233 { "Artec T1 USB1.1 TVBOX with AN2235", 243 { "Artec T1 USB1.1 TVBOX with AN2235",
234 { &dibusb_dib3000mb_table[20], NULL }, 244 { &dibusb_dib3000mb_table[20], NULL },
235 { &dibusb_dib3000mb_table[21], NULL }, 245 { &dibusb_dib3000mb_table[21], NULL },
236 }, 246 },
247#ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
248 { "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)",
249 { &dibusb_dib3000mb_table[25], NULL },
250 { NULL },
251 },
252#endif
237 } 253 }
238}; 254};
239 255