Skip to contentSkip to conversation

Revert "media: uvcvideo: Limit power line control for Acer EasyCamera"

PATCH In review Sakari Ailus 3 participants 3 messages Jun 2, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "media: uvcvideo: Limit power line control for Acer EasyCamera"

This reverts commit 5dd0eab84ae9a4b292baf1ad02e1a273c475cd04.

Revert this patch as it has been merged twice. The earlier merged commit is 81e78a6fc320 ("media: uvcvideo: Limit power line control for Acer EasyCamera").

---
 drivers/media/usb/uvc/uvc_driver.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/media/usb/uvc/uvc_driver.c +0 -9
index 7aefa76a42b31..42ff9795f7000 100644
@@ -2997,15 +2997,6 @@ static const struct usb_device_id uvc_ids[] = {
 	  .bInterfaceProtocol	= 0,
 	  .driver_info		= (kernel_ulong_t)&uvc_ctrl_power_line_limited },
 	/* Acer EasyCamera */
-	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
-				| USB_DEVICE_ID_MATCH_INT_INFO,
-	  .idVendor		= 0x5986,
-	  .idProduct		= 0x1180,
-	  .bInterfaceClass	= USB_CLASS_VIDEO,
-	  .bInterfaceSubClass	= 1,
-	  .bInterfaceProtocol	= 0,
-	  .driver_info		= (kernel_ulong_t)&uvc_ctrl_power_line_limited },
-	/* Acer EasyCamera */
 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 				| USB_DEVICE_ID_MATCH_INT_INFO,
 	  .idVendor		= 0x5986,
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw

Hi Sakari

Quoted 9 lines · Sakari Ailus

This reverts commit 5dd0eab84ae9a4b292baf1ad02e1a273c475cd04.

Revert this patch as it has been merged twice. The earlier merged commit is 81e78a6fc320 ("media: uvcvideo: Limit power line control for Acer EasyCamera").

Quoted 27 lines
---
 drivers/media/usb/uvc/uvc_driver.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/media/usb/uvc/uvc_driver.c +0 -10
index 7aefa76a42b31..42ff9795f7000 100644
@@ -2997,15 +2997,6 @@ static const struct usb_device_id uvc_ids[] = {
          .bInterfaceProtocol   = 0,
          .driver_info          = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
        /* Acer EasyCamera */
-       { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
-                               | USB_DEVICE_ID_MATCH_INT_INFO,
-         .idVendor             = 0x5986,
-         .idProduct            = 0x1180,
-         .bInterfaceClass      = USB_CLASS_VIDEO,
-         .bInterfaceSubClass   = 1,
-         .bInterfaceProtocol   = 0,
-         .driver_info          = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
-       /* Acer EasyCamera */
        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                | USB_DEVICE_ID_MATCH_INT_INFO,
          .idVendor             = 0x5986,
--

2.30.2

Signature · 1 line
Ricardo Ribalda
maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Sakari Ailus

Hi Sakari,

Thank you for the patch.

Quoted 8 lines · Sakari Ailus

This reverts commit 5dd0eab84ae9a4b292baf1ad02e1a273c475cd04.

Revert this patch as it has been merged twice. The earlier merged commit is 81e78a6fc320 ("media: uvcvideo: Limit power line control for Acer EasyCamera").

Oops, my bad.

Quoted 24 lines
---
 drivers/media/usb/uvc/uvc_driver.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/media/usb/uvc/uvc_driver.c +0 -9
index 7aefa76a42b31..42ff9795f7000 100644
@@ -2997,15 +2997,6 @@ static const struct usb_device_id uvc_ids[] = {
 	  .bInterfaceProtocol	= 0,
 	  .driver_info		= (kernel_ulong_t)&uvc_ctrl_power_line_limited },
 	/* Acer EasyCamera */
-	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
-				| USB_DEVICE_ID_MATCH_INT_INFO,
-	  .idVendor		= 0x5986,
-	  .idProduct		= 0x1180,
-	  .bInterfaceClass	= USB_CLASS_VIDEO,
-	  .bInterfaceSubClass	= 1,
-	  .bInterfaceProtocol	= 0,
-	  .driver_info		= (kernel_ulong_t)&uvc_ctrl_power_line_limited },
-	/* Acer EasyCamera */
 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 				| USB_DEVICE_ID_MATCH_INT_INFO,
 	  .idVendor		= 0x5986,
Signature · 3 lines
Regards,

Laurent Pinchart