diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/uvc/uvc_driver.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index b3c4d75e8490..7e102034d38d 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
@@ -1884,7 +1884,7 @@ static struct usb_device_id uvc_ids[] = { | |||
1884 | .bInterfaceSubClass = 1, | 1884 | .bInterfaceSubClass = 1, |
1885 | .bInterfaceProtocol = 0, | 1885 | .bInterfaceProtocol = 0, |
1886 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | 1886 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, |
1887 | /* Packard Bell OEM Webcam */ | 1887 | /* Packard Bell OEM Webcam - Bison Electronics */ |
1888 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 1888 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
1889 | | USB_DEVICE_ID_MATCH_INT_INFO, | 1889 | | USB_DEVICE_ID_MATCH_INT_INFO, |
1890 | .idVendor = 0x5986, | 1890 | .idVendor = 0x5986, |
@@ -1893,7 +1893,7 @@ static struct usb_device_id uvc_ids[] = { | |||
1893 | .bInterfaceSubClass = 1, | 1893 | .bInterfaceSubClass = 1, |
1894 | .bInterfaceProtocol = 0, | 1894 | .bInterfaceProtocol = 0, |
1895 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | 1895 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, |
1896 | /* Acer Crystal Eye webcam */ | 1896 | /* Acer Crystal Eye webcam - Bison Electronics */ |
1897 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 1897 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
1898 | | USB_DEVICE_ID_MATCH_INT_INFO, | 1898 | | USB_DEVICE_ID_MATCH_INT_INFO, |
1899 | .idVendor = 0x5986, | 1899 | .idVendor = 0x5986, |
@@ -1902,7 +1902,7 @@ static struct usb_device_id uvc_ids[] = { | |||
1902 | .bInterfaceSubClass = 1, | 1902 | .bInterfaceSubClass = 1, |
1903 | .bInterfaceProtocol = 0, | 1903 | .bInterfaceProtocol = 0, |
1904 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | 1904 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, |
1905 | /* Medion Akoya Mini E1210 */ | 1905 | /* Medion Akoya Mini E1210 - Bison Electronics */ |
1906 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 1906 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
1907 | | USB_DEVICE_ID_MATCH_INT_INFO, | 1907 | | USB_DEVICE_ID_MATCH_INT_INFO, |
1908 | .idVendor = 0x5986, | 1908 | .idVendor = 0x5986, |
@@ -1911,7 +1911,7 @@ static struct usb_device_id uvc_ids[] = { | |||
1911 | .bInterfaceSubClass = 1, | 1911 | .bInterfaceSubClass = 1, |
1912 | .bInterfaceProtocol = 0, | 1912 | .bInterfaceProtocol = 0, |
1913 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | 1913 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, |
1914 | /* Acer OrbiCam - Unknown vendor */ | 1914 | /* Acer OrbiCam - Bison Electronics */ |
1915 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 1915 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
1916 | | USB_DEVICE_ID_MATCH_INT_INFO, | 1916 | | USB_DEVICE_ID_MATCH_INT_INFO, |
1917 | .idVendor = 0x5986, | 1917 | .idVendor = 0x5986, |
@@ -1920,6 +1920,24 @@ static struct usb_device_id uvc_ids[] = { | |||
1920 | .bInterfaceSubClass = 1, | 1920 | .bInterfaceSubClass = 1, |
1921 | .bInterfaceProtocol = 0, | 1921 | .bInterfaceProtocol = 0, |
1922 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | 1922 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, |
1923 | /* Bison Electronics */ | ||
1924 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
1925 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
1926 | .idVendor = 0x5986, | ||
1927 | .idProduct = 0x0300, | ||
1928 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
1929 | .bInterfaceSubClass = 1, | ||
1930 | .bInterfaceProtocol = 0, | ||
1931 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
1932 | /* Clevo M570TU - Bison Electronics */ | ||
1933 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
1934 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
1935 | .idVendor = 0x5986, | ||
1936 | .idProduct = 0x0303, | ||
1937 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
1938 | .bInterfaceSubClass = 1, | ||
1939 | .bInterfaceProtocol = 0, | ||
1940 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
1923 | /* Generic USB Video Class */ | 1941 | /* Generic USB Video Class */ |
1924 | { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) }, | 1942 | { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) }, |
1925 | {} | 1943 | {} |