| From 3eb12a0002f1cfa5187110530b1c5bc0fe11ab35 Mon Sep 17 00:00:00 2001 |
| From: Max Staudt <mstaudt@chromium.org> |
| Date: Tue, 13 Feb 2024 15:52:57 +0900 |
| Subject: [PATCH] CHROMIUM: media: usb: uvc: Renumber downstream |
| UVC_QUIRK_DISABLE_AUTOSUSPEND |
| |
| UVC_QUIRK_DISABLE_AUTOSUSPEND is a downstream-only quirk, and this patch |
| brings its assigned bit in line with the other downstream kernel branches. |
| This way, the UVC_QUIRK_* number space is free for further sequential |
| assignments from upstream, without clashing with downstream quirks. |
| |
| In this particular case, the cleanup happened while backporting a |
| FROMLIST patch for b:291728341 which will be handled as a downstream |
| quirk until an upstream patch is backported. |
| |
| The assigned UPSTREAM-TASK is that of the commit referenced in the |
| Fixes: tag. |
| |
| Fixes: 76262df19062 ("BACKPORT: FROMLIST: media: uvcvideo: Disable autosuspend for Insta360 Link") |
| |
| BUG=b:291728341 |
| UPSTREAM-TASK=b:255969015 |
| TEST=trivial |
| |
| Change-Id: Icc297a2b215faafc22a59b7506812a63813141d1 |
| Signed-off-by: Max Staudt <mstaudt@chromium.org> |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/5290134 |
| Tested-by: Tomasz Figa <tfiga@chromium.org> |
| Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> |
| Reviewed-by: Tomasz Figa <tfiga@chromium.org> |
| --- |
| drivers/media/usb/uvc/uvcvideo.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h |
| index 847ee234d66efe70c904e693e881e03a03dfcd17..abbc9f8cfce4e7a38ee2c71c6ec59008fb6a6814 100644 |
| --- a/drivers/media/usb/uvc/uvcvideo.h |
| +++ b/drivers/media/usb/uvc/uvcvideo.h |
| @@ -75,8 +75,8 @@ |
| #define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000 |
| #define UVC_QUIRK_NO_RESET_RESUME 0x00004000 |
| #define UVC_QUIRK_PRIVACY_DURING_STREAM 0x00006000 |
| -#define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x00008000 |
| #define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000 |
| +#define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x40000000 |
| |
| /* Format flags */ |
| #define UVC_FMT_FLAG_COMPRESSED 0x00000001 |
| -- |
| 2.46.0.rc2.264.g509ed76dc8-goog |
| |
