| Message ID | 20230602131919.3363606-1-sakari.ailus@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 0ece58b280a4fa5e34cac64524a991f3cadccc45 |
| Headers | show |
| Series | [1/1] Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" | expand |
Hi Sakari On Fri, 2 Jun 2023 at 15:20, Sakari Ailus <sakari.ailus@linux.intel.com> wrote: > > 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"). > > Reported-by: Dmitry Perchanov <dmitry.perchanov@intel.com> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> > --- > drivers/media/usb/uvc/uvc_driver.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 7aefa76a42b31..42ff9795f7000 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -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 >
Hi Sakari, Thank you for the patch. On Fri, Jun 02, 2023 at 04:19:19PM +0300, Sakari Ailus wrote: > 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"). > > Reported-by: Dmitry Perchanov <dmitry.perchanov@intel.com> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Oops, my bad. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/usb/uvc/uvc_driver.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 7aefa76a42b31..42ff9795f7000 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -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,
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 7aefa76a42b31..42ff9795f7000 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -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,
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"). Reported-by: Dmitry Perchanov <dmitry.perchanov@intel.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/usb/uvc/uvc_driver.c | 9 --------- 1 file changed, 9 deletions(-)