|
@@ -2343,7 +2343,7 @@ static const struct uvc_device_info uvc_quirk_force_y8 = {
|
|
|
.quirks = UVC_QUIRK_FORCE_Y8,
|
|
|
};
|
|
|
|
|
|
-#define UVC_QUIRK_INFO(q) (kernel_ulong_t)&(struct uvc_device_info){.quirks = q}
|
|
|
+#define UVC_INFO_QUIRK(q) (kernel_ulong_t)&(struct uvc_device_info){.quirks = q}
|
|
|
|
|
|
/*
|
|
|
* The Logitech cameras listed below have their interface class set to
|
|
@@ -2452,7 +2452,7 @@ static const struct usb_device_id uvc_ids[] = {
|
|
|
.bInterfaceClass = USB_CLASS_VIDEO,
|
|
|
.bInterfaceSubClass = 1,
|
|
|
.bInterfaceProtocol = 0,
|
|
|
- .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) },
|
|
|
+ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) },
|
|
|
/* Chicony CNF7129 (Asus EEE 100HE) */
|
|
|
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|
|
|
| USB_DEVICE_ID_MATCH_INT_INFO,
|
|
@@ -2461,7 +2461,7 @@ static const struct usb_device_id uvc_ids[] = {
|
|
|
.bInterfaceClass = USB_CLASS_VIDEO,
|
|
|
.bInterfaceSubClass = 1,
|
|
|
.bInterfaceProtocol = 0,
|
|
|
- .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_RESTRICT_FRAME_RATE) },
|
|
|
+ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTRICT_FRAME_RATE) },
|
|
|
/* Alcor Micro AU3820 (Future Boy PC USB Webcam) */
|
|
|
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|
|
|
| USB_DEVICE_ID_MATCH_INT_INFO,
|
|
@@ -2524,7 +2524,7 @@ static const struct usb_device_id uvc_ids[] = {
|
|
|
.bInterfaceClass = USB_CLASS_VIDEO,
|
|
|
.bInterfaceSubClass = 1,
|
|
|
.bInterfaceProtocol = 0,
|
|
|
- .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_MINMAX
|
|
|
+ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX
|
|
|
| UVC_QUIRK_BUILTIN_ISIGHT) },
|
|
|
/* Apple Built-In iSight via iBridge */
|
|
|
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|
|
@@ -2606,7 +2606,7 @@ static const struct usb_device_id uvc_ids[] = {
|
|
|
.bInterfaceClass = USB_CLASS_VIDEO,
|
|
|
.bInterfaceSubClass = 1,
|
|
|
.bInterfaceProtocol = 0,
|
|
|
- .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_MINMAX
|
|
|
+ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX
|
|
|
| UVC_QUIRK_PROBE_DEF) },
|
|
|
/* IMC Networks (Medion Akoya) */
|
|
|
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|
|
@@ -2706,7 +2706,7 @@ static const struct usb_device_id uvc_ids[] = {
|
|
|
.bInterfaceClass = USB_CLASS_VIDEO,
|
|
|
.bInterfaceSubClass = 1,
|
|
|
.bInterfaceProtocol = 0,
|
|
|
- .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_MINMAX
|
|
|
+ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX
|
|
|
| UVC_QUIRK_PROBE_EXTRAFIELDS) },
|
|
|
/* Aveo Technology USB 2.0 Camera (Tasco USB Microscope) */
|
|
|
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|
|
@@ -2724,7 +2724,7 @@ static const struct usb_device_id uvc_ids[] = {
|
|
|
.bInterfaceClass = USB_CLASS_VIDEO,
|
|
|
.bInterfaceSubClass = 1,
|
|
|
.bInterfaceProtocol = 0,
|
|
|
- .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_EXTRAFIELDS) },
|
|
|
+ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_PROBE_EXTRAFIELDS) },
|
|
|
/* Manta MM-353 Plako */
|
|
|
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|
|
|
| USB_DEVICE_ID_MATCH_INT_INFO,
|
|
@@ -2770,7 +2770,7 @@ static const struct usb_device_id uvc_ids[] = {
|
|
|
.bInterfaceClass = USB_CLASS_VIDEO,
|
|
|
.bInterfaceSubClass = 1,
|
|
|
.bInterfaceProtocol = 0,
|
|
|
- .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_STATUS_INTERVAL) },
|
|
|
+ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_STATUS_INTERVAL) },
|
|
|
/* MSI StarCam 370i */
|
|
|
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|
|
|
| USB_DEVICE_ID_MATCH_INT_INFO,
|
|
@@ -2797,7 +2797,7 @@ static const struct usb_device_id uvc_ids[] = {
|
|
|
.bInterfaceClass = USB_CLASS_VIDEO,
|
|
|
.bInterfaceSubClass = 1,
|
|
|
.bInterfaceProtocol = 0,
|
|
|
- .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_MINMAX
|
|
|
+ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX
|
|
|
| UVC_QUIRK_IGNORE_SELECTOR_UNIT) },
|
|
|
/* Oculus VR Positional Tracker DK2 */
|
|
|
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|