aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJoseph Salisbury <joseph.salisbury@canonical.com>2013-05-15 16:38:48 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-08 18:50:21 -0400
commitc2a273b24f2c82184cc0f04ba3a61da51c84724b (patch)
treedbc1e4bf49c83bbe0c0e19eee7dba61c2afc8922 /drivers/media
parentafcf44c786765b4eee44eea39ac0fddbbb830926 (diff)
[media] uvcvideo: quirk PROBE_DEF for Alienware X51 OmniVision webcam
BugLink: http://bugs.launchpad.net/bugs/1180409 OminiVision webcam 0x05a9:0x2643 needs the same UVC_QUIRK_PROBE_DEF as other OmniVision models to work properly. Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/uvc/uvc_driver.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 17bd48d16e5a..a7e64af5f82e 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2163,6 +2163,15 @@ static struct usb_device_id uvc_ids[] = {
2163 .bInterfaceSubClass = 1, 2163 .bInterfaceSubClass = 1,
2164 .bInterfaceProtocol = 0, 2164 .bInterfaceProtocol = 0,
2165 .driver_info = UVC_QUIRK_PROBE_DEF }, 2165 .driver_info = UVC_QUIRK_PROBE_DEF },
2166 /* Dell Alienware X51 */
2167 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
2168 | USB_DEVICE_ID_MATCH_INT_INFO,
2169 .idVendor = 0x05a9,
2170 .idProduct = 0x2643,
2171 .bInterfaceClass = USB_CLASS_VIDEO,
2172 .bInterfaceSubClass = 1,
2173 .bInterfaceProtocol = 0,
2174 .driver_info = UVC_QUIRK_PROBE_DEF },
2166 /* Dell Studio Hybrid 140g (OmniVision webcam) */ 2175 /* Dell Studio Hybrid 140g (OmniVision webcam) */
2167 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE 2176 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
2168 | USB_DEVICE_ID_MATCH_INT_INFO, 2177 | USB_DEVICE_ID_MATCH_INT_INFO,