diff options
Diffstat (limited to 'drivers/media/video/uvc/uvc_driver.c')
-rw-r--r-- | drivers/media/video/uvc/uvc_driver.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index b6eae48d7fb..d29f9c2d085 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/videodev2.h> | 31 | #include <linux/videodev2.h> |
32 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
33 | #include <linux/wait.h> | 33 | #include <linux/wait.h> |
34 | #include <linux/version.h> | ||
34 | #include <asm/atomic.h> | 35 | #include <asm/atomic.h> |
35 | #include <asm/unaligned.h> | 36 | #include <asm/unaligned.h> |
36 | 37 | ||
@@ -1857,7 +1858,7 @@ static int uvc_probe(struct usb_interface *intf, | |||
1857 | sizeof(dev->mdev.serial)); | 1858 | sizeof(dev->mdev.serial)); |
1858 | strcpy(dev->mdev.bus_info, udev->devpath); | 1859 | strcpy(dev->mdev.bus_info, udev->devpath); |
1859 | dev->mdev.hw_revision = le16_to_cpu(udev->descriptor.bcdDevice); | 1860 | dev->mdev.hw_revision = le16_to_cpu(udev->descriptor.bcdDevice); |
1860 | dev->mdev.driver_version = DRIVER_VERSION_NUMBER; | 1861 | dev->mdev.driver_version = LINUX_VERSION_CODE; |
1861 | if (media_device_register(&dev->mdev) < 0) | 1862 | if (media_device_register(&dev->mdev) < 0) |
1862 | goto error; | 1863 | goto error; |
1863 | 1864 | ||
@@ -2130,6 +2131,15 @@ static struct usb_device_id uvc_ids[] = { | |||
2130 | .bInterfaceProtocol = 0, | 2131 | .bInterfaceProtocol = 0, |
2131 | .driver_info = UVC_QUIRK_PROBE_MINMAX | 2132 | .driver_info = UVC_QUIRK_PROBE_MINMAX |
2132 | | UVC_QUIRK_BUILTIN_ISIGHT }, | 2133 | | UVC_QUIRK_BUILTIN_ISIGHT }, |
2134 | /* Foxlink ("HP Webcam" on HP Mini 5103) */ | ||
2135 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
2136 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
2137 | .idVendor = 0x05c8, | ||
2138 | .idProduct = 0x0403, | ||
2139 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
2140 | .bInterfaceSubClass = 1, | ||
2141 | .bInterfaceProtocol = 0, | ||
2142 | .driver_info = UVC_QUIRK_FIX_BANDWIDTH }, | ||
2133 | /* Genesys Logic USB 2.0 PC Camera */ | 2143 | /* Genesys Logic USB 2.0 PC Camera */ |
2134 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 2144 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
2135 | | USB_DEVICE_ID_MATCH_INT_INFO, | 2145 | | USB_DEVICE_ID_MATCH_INT_INFO, |