* [PATCH 1/1] Revert "media: uvcvideo: Limit power line control for Acer EasyCamera"
@ 2023-06-02 13:19 Sakari Ailus
2023-06-02 13:22 ` Ricardo Ribalda
2023-06-02 13:59 ` Laurent Pinchart
0 siblings, 2 replies; 3+ messages in thread
From: Sakari Ailus @ 2023-06-02 13:19 UTC (permalink / raw)
To: linux-media
Cc: Ricardo Ribalda, Sergey Senozhatsky, Laurent Pinchart, Dmitry Perchanov
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] Revert "media: uvcvideo: Limit power line control for Acer EasyCamera"
2023-06-02 13:19 [PATCH 1/1] Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" Sakari Ailus
@ 2023-06-02 13:22 ` Ricardo Ribalda
2023-06-02 13:59 ` Laurent Pinchart
1 sibling, 0 replies; 3+ messages in thread
From: Ricardo Ribalda @ 2023-06-02 13:22 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, Sergey Senozhatsky, Laurent Pinchart, Dmitry Perchanov
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
>
--
Ricardo Ribalda
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] Revert "media: uvcvideo: Limit power line control for Acer EasyCamera"
2023-06-02 13:19 [PATCH 1/1] Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" Sakari Ailus
2023-06-02 13:22 ` Ricardo Ribalda
@ 2023-06-02 13:59 ` Laurent Pinchart
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2023-06-02 13:59 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, Ricardo Ribalda, Sergey Senozhatsky, Dmitry Perchanov
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,
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-02 13:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-02 13:19 [PATCH 1/1] Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" Sakari Ailus
2023-06-02 13:22 ` Ricardo Ribalda
2023-06-02 13:59 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).