diff options
| author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-07-19 18:16:05 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-13 19:39:05 -0400 |
| commit | d79cd8393ae85ebaf53a8fc93491eea96522d68e (patch) | |
| tree | 0c52ab52ace3ef6e7e59cb73c8456bf4ad60a598 /drivers/media | |
| parent | d1ae4e1d05cc982b6b480c1a3d69b8bb231e3493 (diff) | |
V4L/DVB (12328): uvcvideo: Don't apply the FIX_BANDWIDTH quirk to all ViMicro devices
Commit 50144aeeb702ea105697ae5249f059ea3990b838 broke the Samsung NC10
netbook webcam. Instead of applying the FIX_BANDWIDTH quirk to all ViMicro
devices, list the devices explicitly.
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/uvc/uvc_driver.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index 89927b7aec28..04b47832fa0a 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
| @@ -1845,11 +1845,29 @@ static struct usb_device_id uvc_ids[] = { | |||
| 1845 | .bInterfaceSubClass = 1, | 1845 | .bInterfaceSubClass = 1, |
| 1846 | .bInterfaceProtocol = 0, | 1846 | .bInterfaceProtocol = 0, |
| 1847 | .driver_info = UVC_QUIRK_STREAM_NO_FID }, | 1847 | .driver_info = UVC_QUIRK_STREAM_NO_FID }, |
| 1848 | /* ViMicro */ | 1848 | /* ViMicro Vega */ |
| 1849 | { .match_flags = USB_DEVICE_ID_MATCH_VENDOR | 1849 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
| 1850 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1851 | .idVendor = 0x0ac8, | ||
| 1852 | .idProduct = 0x332d, | ||
| 1853 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1854 | .bInterfaceSubClass = 1, | ||
| 1855 | .bInterfaceProtocol = 0, | ||
| 1856 | .driver_info = UVC_QUIRK_FIX_BANDWIDTH }, | ||
| 1857 | /* ViMicro - Minoru3D */ | ||
| 1858 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1859 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1860 | .idVendor = 0x0ac8, | ||
| 1861 | .idProduct = 0x3410, | ||
| 1862 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1863 | .bInterfaceSubClass = 1, | ||
| 1864 | .bInterfaceProtocol = 0, | ||
| 1865 | .driver_info = UVC_QUIRK_FIX_BANDWIDTH }, | ||
| 1866 | /* ViMicro Venus - Minoru3D */ | ||
| 1867 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1850 | | USB_DEVICE_ID_MATCH_INT_INFO, | 1868 | | USB_DEVICE_ID_MATCH_INT_INFO, |
| 1851 | .idVendor = 0x0ac8, | 1869 | .idVendor = 0x0ac8, |
| 1852 | .idProduct = 0x0000, | 1870 | .idProduct = 0x3420, |
| 1853 | .bInterfaceClass = USB_CLASS_VIDEO, | 1871 | .bInterfaceClass = USB_CLASS_VIDEO, |
| 1854 | .bInterfaceSubClass = 1, | 1872 | .bInterfaceSubClass = 1, |
| 1855 | .bInterfaceProtocol = 0, | 1873 | .bInterfaceProtocol = 0, |