Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V6.1.92 rebase #2554

Merged
merged 1 commit into from
Aug 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 590e5f5f7c137db4697680450fa10cabc3d35200 Mon Sep 17 00:00:00 2001
From 9166c8e062e9987a740159ff5bdb2925b68c8ed4 Mon Sep 17 00:00:00 2001
From: saranya <[email protected]>
Date: Thu, 4 Jun 2020 14:17:06 +0530
Subject: [PATCH] uvc: Add UVC GET_DEF probe quirk for C922 camera
Expand All @@ -16,13 +16,13 @@ Signed-off-by: saranya <[email protected]>
1 file changed, 9 insertions(+)

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 881da7c17fb7..8e6fa8fa5741 100644
index 37a9da4902fa7..7ed30855bc532 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2613,6 +2613,15 @@ static const struct usb_device_id uvc_ids[] = {
@@ -2630,6 +2630,15 @@ static const struct usb_device_id uvc_ids[] = {
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0,
.driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) },
.driver_info = UVC_INFO_QUIRK(UVC_QUIRK_FORCE_RESUME) },
+ /* Logitech HD Pro Webcam C922 */
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
+ | USB_DEVICE_ID_MATCH_INT_INFO,
Expand All @@ -36,5 +36,5 @@ index 881da7c17fb7..8e6fa8fa5741 100644
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
| USB_DEVICE_ID_MATCH_INT_INFO,
--
2.40.1
2.45.2

This file was deleted.

This file was deleted.

Loading