mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "uvcvideo: add quirk for devices with broken auto suspend"

Browse Source 
This reverts commit f21eb9cd0a.

The upstream commit 991df39499 ("media: uvcvideo: Disable
autosuspend for Insta360 Link") has introduced a new quirk
"UVC_QUIRK_DISABLE_AUTOSUSPEND" for usb cameras to disable
autosuspend, so let's remove legacy autosuspend quirks.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I406b42e9771aceaa0439221ae3b0753fd7b96d43
This commit is contained in:
William Wu
2025-04-08 10:12:47 +08:00
committed by Tao Huang
parent 5f8a3c94fb
commit b6fb24f3b0
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/usb/uvc/uvc_driver.c
View File

@@ -15,7 +15,6 @@
#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/usb/uvc.h>
#include <linux/usb/quirks.h>
#include <linux/videodev2.h>
#include <linux/vmalloc.h>
#include <linux/wait.h>
@@ -2234,11 +2233,7 @@ static int uvc_probe(struct usb_interface *intf,
}
uvc_dbg(dev, PROBE, "UVC device initialized\n");
if (udev->quirks & USB_QUIRK_AUTO_SUSPEND ||
udev->parent->quirks & USB_QUIRK_AUTO_SUSPEND)
dev_info(&dev->udev->dev, "auto-suspend is blacklisted for this device\n");
else
usb_enable_autosuspend(udev);
usb_enable_autosuspend(udev);
return 0;
error:

3
drivers/usb/core/quirks.c
View File

@@ -325,9 +325,6 @@ static const struct usb_device_id usb_quirk_list[] = {
/* Alcor Micro Corp. Hub */
{ USB_DEVICE(0x058f, 0x9254), .driver_info = USB_QUIRK_RESET_RESUME },
/* HD Camera Manufacturer */
{ USB_DEVICE(0x05a3, 0x9230), .driver_info = USB_QUIRK_AUTO_SUSPEND },
/* appletouch */
{ USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },