diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-07 12:00:18 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-01-07 12:00:18 +0100 |
| commit | 1efd156795c55b086c28f4eeab1d33ca12adfed5 (patch) | |
| tree | aabf1704cc7084e1308d3dcce73ae867630515d5 /linux | |
| parent | 721419f06f4c6afd216f35c556233b9e66fb98f8 (diff) | |
| download | mediapointer-dvb-s2-1efd156795c55b086c28f4eeab1d33ca12adfed5.tar.gz mediapointer-dvb-s2-1efd156795c55b086c28f4eeab1d33ca12adfed5.tar.bz2 | |
gspca - zc3xx / zc0301: Handle the 0ac8:303b instead of zc0301.
From: Jean-Francois Moine <moinejf@free.fr>
This webcam is generic and some sensors are not treated by
the driver zc0301.
Priority: normal
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/gspca/zc3xx.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/zc0301/zc0301_sensor.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/linux/drivers/media/video/gspca/zc3xx.c b/linux/drivers/media/video/gspca/zc3xx.c index c044cd495..8a799dbf5 100644 --- a/linux/drivers/media/video/gspca/zc3xx.c +++ b/linux/drivers/media/video/gspca/zc3xx.c @@ -7573,9 +7573,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/linux/drivers/media/video/zc0301/zc0301_sensor.h b/linux/drivers/media/video/zc0301/zc0301_sensor.h index 4dc95b5c2..a9cde5419 100644 --- a/linux/drivers/media/video/zc0301/zc0301_sensor.h +++ b/linux/drivers/media/video/zc0301/zc0301_sensor.h @@ -59,12 +59,20 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor); .idProduct = (prod), \ .bInterfaceClass = (intclass) +#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE #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 */ \ { } \ }; +#else +#define ZC0301_ID_TABLE \ +static const struct usb_device_id zc0301_id_table[] = { \ + { ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */ \ + { } \ +}; +#endif /*****************************************************************************/ |