From: Jani Monoses Date: Sat, 1 Nov 2008 11:37:33 +0000 (+0200) Subject: UBUNTU: Fix webcam having USB ID 0ac8:303b X-Git-Tag: Ubuntu-2.6.27-12.28~143 X-Git-Url: http://kernel.ubuntu.com/git?p=ubuntu%2Fubuntu-intrepid.git;a=commitdiff_plain;h=0feccfbc02792f9555bd77aa611b863f82974214;hp=5f4cff12e701a09044f0a87d69e8a6f3dabe57ca UBUNTU: Fix webcam having USB ID 0ac8:303b Bug: #292086 Make webcams with USB ID 0ac8:303b, such as the Z-Star Microelectronics Corp. ZC0303 be handled by gspca not the zc0301 driver. The latter does not seem to handle them anymore in Intrepid. Signed-off-by: Jani Monoses Signed-off-by: Andy Whitcroft Acked-by: Tim Gardner Acked-by: Stefan Bader --- diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index d61ef72..9842dc1 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c @@ -7555,9 +7555,7 @@ static const __devinitdata struct usb_device_id device_table[] = { {USB_DEVICE(0x0ac8, 0x0301), .driver_info = SENSOR_PAS106}, {USB_DEVICE(0x0ac8, 0x0302)}, {USB_DEVICE(0x0ac8, 0x301b)}, -#if !defined CONFIG_USB_ZC0301 && !defined CONFIG_USB_ZC0301_MODULE {USB_DEVICE(0x0ac8, 0x303b)}, -#endif {USB_DEVICE(0x0ac8, 0x305b), .driver_info = SENSOR_TAS5130C_VF0250}, {USB_DEVICE(0x0ac8, 0x307b)}, {USB_DEVICE(0x10fd, 0x0128)}, diff --git a/drivers/media/video/zc0301/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h index b0cd49c..2a9f02d 100644 --- a/drivers/media/video/zc0301/zc0301_sensor.h +++ b/drivers/media/video/zc0301/zc0301_sensor.h @@ -61,7 +61,6 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor); #define ZC0301_ID_TABLE \ static const struct usb_device_id zc0301_id_table[] = { \ { ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */ \ - { ZC0301_USB_DEVICE(0x0ac8, 0x303b, 0xff), }, /* PB-0330 */ \ { } \ };