View | Details | Raw Unified | Return to bug 248926 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/webcamd/files/patch-media_tree-drivers-media-usb-gspca-vc032x.c (+20 lines)
Line 0 Link Here
1 
--- ./media_tree/drivers/media/usb/gspca/vc032x.c.orig	2020-09-04 08:48:57.611586000 +0200
2 
+++ ./media_tree/drivers/media/usb/gspca/vc032x.c	2020-09-04 08:50:51.088046000 +0200
3 
@@ -3132,8 +3132,7 @@
4 
 	sd->bridge = id->driver_info >> 8;
5 
 	sd->flags = id->driver_info & 0xff;
6
7 
-	if (id->idVendor == 0x046d &&
8 
-	    (id->idProduct == 0x0892 || id->idProduct == 0x0896))
9 
+	if (id->idVendor == 0x046d && id->idProduct == 0x0896)
10 
 		sd->sensor = SENSOR_POxxxx;	/* no probe */
11
12 
 	return 0;
13 
@@ -3799,7 +3798,6 @@
14 
 		| (flags)
15 
 static const struct usb_device_id device_table[] = {
16 
 	{USB_DEVICE(0x041e, 0x405b), BF(VC0323, FL_VFLIP)},
17 
-	{USB_DEVICE(0x046d, 0x0892), BF(VC0321, 0)},
18 
 	{USB_DEVICE(0x046d, 0x0896), BF(VC0321, 0)},
19 
 	{USB_DEVICE(0x046d, 0x0897), BF(VC0321, 0)},
20 
 	{USB_DEVICE(0x0ac8, 0x0321), BF(VC0321, 0)},
(-)multimedia/webcamd/files/patch-media_tree-drivers-media-usb-uvc-uvc_driver.c (+18 lines)
Line 0 Link Here
1 
--- media_tree/drivers/media/usb/uvc/uvc_driver.c.orig	2020-09-04 08:46:54.730859000 +0200
2 
+++ media_tree/drivers/media/usb/uvc/uvc_driver.c	2020-09-04 08:47:38.051154000 +0200
3 
@@ -2526,6 +2526,15 @@
4 
 	  .bInterfaceSubClass	= 1,
5 
 	  .bInterfaceProtocol	= 0,
6 
 	  .driver_info		= UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) },
7 
+	/* Logitech HD Pro Webcam C920 (newer) */
8 
+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
9 
+				| USB_DEVICE_ID_MATCH_INT_INFO,
10 
+	  .idVendor		= 0x046d,
11 
+	  .idProduct		= 0x0892,
12 
+	  .bInterfaceClass	= USB_CLASS_VIDEO,
13 
+	  .bInterfaceSubClass	= 1,
14 
+	  .bInterfaceProtocol	= 0,
15 
+	  .driver_info		= UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) },
16 
 	/* Chicony CNF7129 (Asus EEE 100HE) */
17 
 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
18 
 				| USB_DEVICE_ID_MATCH_INT_INFO,

Return to bug 248926