From nobody Sun Feb 8 12:19:34 2026 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25FA62BF3CE for ; Tue, 29 Apr 2025 13:47:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745934452; cv=none; b=IqBf67rCxba5pgkCMmA8/CmAxARL//LAGZRZvLoem8SxEx+SQwnBoYAHoA9CyzaLUoeGQEHd9AEVRp/Cv4oAcKoIAl0/+9Na7E77cRR04QzPQjxrNbazTVxVM4NiKK24E3k/wBYjDRLVWfSPrlvXTfVMXGx/t+MohsX5+u0wzFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745934452; c=relaxed/simple; bh=ZwWBvzIJ5GC5M31c0M7zl8dfShRs+K7zCYno75T0OL0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dbyvamLo0HG5Id2p+o6hB37cXrhzCNkUym7aji3xQhLG6m7ILQAmqLInMovS5uIgPZ/7IQF30BhUbz70pgAI7udOnlUre5CtDxM78Z6q3sVEHED1XklJa8GIdXyc5C/RmBug81HcwbenZOslG7jEkwaZShIiy6eV7isqSi6rh5U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=LfBL6k4H; arc=none smtp.client-ip=209.85.167.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="LfBL6k4H" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-54b10956398so6907089e87.0 for ; Tue, 29 Apr 2025 06:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1745934447; x=1746539247; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=1DnyA9V780HJCFny7+LK/Q+ehxWuLx4xXoXEbbmbGd0=; b=LfBL6k4H0RC9U4V/CHRsAs/KlzkJ1MMpoRlU2esvq36u/nZNZN1QouVP3o1vVCV/Ks pZXyMeogp8B3galBGViNI5X4beOaXWfjNi/Z9AUVuj6RoqXgLAqmVJXWC07/uSabEKj8 U3upcF+PHpIRYBjOCcFNb6QIeD3xHjOgLOrJ4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745934447; x=1746539247; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1DnyA9V780HJCFny7+LK/Q+ehxWuLx4xXoXEbbmbGd0=; b=DVxShX4itb+5SmiX2fMIiu5Cf/YlmivDV0LIHwa+m5dvkDO3WlpSc/KIzo4YHWa+ib T4yav2NJqCZE9oF1JoAo8uCHm+ObUavs4pr18UoiJRl82MWh7e7hSZpZKWstur9Gu6cD vl5U0KM6PzgfxeqNXLM4K3aHvF+Gi4MoFnXYbb8PzLEFFWTjVd0JdoYVcEXwZ3JUj/dI oucsq5CfNsl3weW62EIrB26tCWFKhdem1p+8oboBVLNVl0x80z2Wt09uvMn/DHVCILeI 6eEYV/L2Uf1vcc8VpLwWdn+ioTEfQBFuqAe3rGDcLSdH2Zbk98ytocmQnb+L+exToGap u5LQ== X-Forwarded-Encrypted: i=1; AJvYcCVW9cE+cEZqX+JVXaZxyw5pCPLjgdEh6kbJqILVMDu8qRBVyG/fLcB/J9Uwg6D3r6V85OpwzYKxoVh0PWA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3MfKVGYy33IyOe8hi2fqZewAU4vpX0qcUjWO1h1zwpS/YOs+j lWaPN4ktdBu/0NlSXZtfoTj505BL99ZBGDfEgdopzm3XSUoNmCaVvu84xykkMA== X-Gm-Gg: ASbGncvwckSe79vqXtFXBiO+zxsTr4pbTUJ01oZlo+uyhOc3+ubg3pbIXzDi1cZEIFV RwGtFFWJ2yGXHqLAPpzMNTxTyQNY0Gly0lypwCpHUcKC+6L7fjji2TIMjCy34DqQKU1Xvny8Mog NqoxSwpRlolWfIxJmjgDa88bPfi63uxNbAFkgeiDQ8xnVdnG6z3r0br6nhsrJooLU651d6ax5YL igm/N8uJPauxP/98FVtyjoaWULZusVJOgJBmS4GhvJfCuFOTJ/A0430cEn22eniTIWS+ci61fjH urTXg0xG7UpqcZynAaarx7ramb0TYWtcFzn4axOfpNGBJ4KZL/46q8+xntTimKGbxgK+DpyYH38 tqO7aYfBW+dx8JxKLnHbQ X-Google-Smtp-Source: AGHT+IE6kffEGT1U7Ld+BifEkJPEY37YzSpY20eNW/La5eIkxBkaohbCHK6PkhNh8/QA1yuZmbn7Iw== X-Received: by 2002:a05:6512:234a:b0:549:6309:2b9d with SMTP id 2adb3069b0e04-54e9e173ecbmr901067e87.13.1745934447101; Tue, 29 Apr 2025 06:47:27 -0700 (PDT) Received: from ribalda.c.googlers.com (228.231.88.34.bc.googleusercontent.com. [34.88.231.228]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54e7cb2626fsm1902375e87.46.2025.04.29.06.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 06:47:26 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 29 Apr 2025 13:47:25 +0000 Subject: [PATCH 1/2] media: uvcvideo: Rewrite uvc_ids for keep-sorted. Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250429-keep-sorted-v1-1-2fa3538c0315@chromium.org> References: <20250429-keep-sorted-v1-0-2fa3538c0315@chromium.org> In-Reply-To: <20250429-keep-sorted-v1-0-2fa3538c0315@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 keep-sorted is a tool to check if the code is sorted. If we enable it in media-ci we will automate some of the boring comments. This is a preparation patch to enable keep-sorted. No functional change is expected. It has been tested with objdump: ribalda@ribalda:~/work/linux$ diff drivers/media/usb/uvc/uvc_driver.o.S dri= vers/media/usb/uvc/uvc_driver.o.new.S 2c2 < drivers/media/usb/uvc/uvc_driver.o: file format elf64-x86-64 --- drivers/media/usb/uvc/uvc_driver.c | 618 +++++++++++++++++++++++----------= ---- 1 file changed, 386 insertions(+), 232 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 107e0fafd80f54ec98c9657e5d58d17a6ed8c02f..7ced8980543af5a207938d12a5e= b833ee8a34c38 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2501,8 +2501,7 @@ static const struct uvc_device_info uvc_quirk_force_y= 8 =3D { */ static const struct usb_device_id uvc_ids[] =3D { /* Quanta ACER HD User Facing */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE - | USB_DEVICE_ID_MATCH_INT_INFO, + { .idVendor =3D 0x0408, .idProduct =3D 0x4033, .bInterfaceClass =3D USB_CLASS_VIDEO, @@ -2510,10 +2509,12 @@ static const struct usb_device_id uvc_ids[] =3D { .bInterfaceProtocol =3D UVC_PC_PROTOCOL_15, .driver_info =3D (kernel_ulong_t)&(const struct uvc_device_info){ .uvc_version =3D 0x010a, - } }, - /* Quanta ACER HD User Facing */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + }, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Quanta ACER HD User Facing */ + { .idVendor =3D 0x0408, .idProduct =3D 0x4035, .bInterfaceClass =3D USB_CLASS_VIDEO, @@ -2521,530 +2522,648 @@ static const struct usb_device_id uvc_ids[] =3D { .bInterfaceProtocol =3D UVC_PC_PROTOCOL_15, .driver_info =3D (kernel_ulong_t)&(const struct uvc_device_info){ .uvc_version =3D 0x010a, - } }, - /* LogiLink Wireless Webcam */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + }, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* LogiLink Wireless Webcam */ + { .idVendor =3D 0x0416, .idProduct =3D 0xa91a, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Genius eFace 2025 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Genius eFace 2025 */ + { .idVendor =3D 0x0458, .idProduct =3D 0x706e, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Microsoft Lifecam NX-6000 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Microsoft Lifecam NX-6000 */ + { .idVendor =3D 0x045e, .idProduct =3D 0x00f8, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Microsoft Lifecam NX-3000 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Microsoft Lifecam NX-3000 */ + { .idVendor =3D 0x045e, .idProduct =3D 0x0721, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Microsoft Lifecam VX-7000 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Microsoft Lifecam VX-7000 */ + { .idVendor =3D 0x045e, .idProduct =3D 0x0723, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Logitech, Webcam C910 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech, Webcam C910 */ + { .idVendor =3D 0x046d, .idProduct =3D 0x0821, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)}, - /* Logitech, Webcam B910 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech, Webcam B910 */ + { .idVendor =3D 0x046d, .idProduct =3D 0x0823, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)}, - /* Logitech Quickcam Fusion */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Quickcam Fusion */ + { .idVendor =3D 0x046d, .idProduct =3D 0x08c1, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, - .bInterfaceProtocol =3D 0 }, - /* Logitech Quickcam Orbit MP */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .bInterfaceProtocol =3D 0, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Quickcam Orbit MP */ + { .idVendor =3D 0x046d, .idProduct =3D 0x08c2, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, - .bInterfaceProtocol =3D 0 }, - /* Logitech Quickcam Pro for Notebook */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .bInterfaceProtocol =3D 0, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Quickcam Pro for Notebook */ + { .idVendor =3D 0x046d, .idProduct =3D 0x08c3, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, - .bInterfaceProtocol =3D 0 }, - /* Logitech Quickcam Pro 5000 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .bInterfaceProtocol =3D 0, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Quickcam Pro 5000 */ + { .idVendor =3D 0x046d, .idProduct =3D 0x08c5, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, - .bInterfaceProtocol =3D 0 }, - /* Logitech Quickcam OEM Dell Notebook */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .bInterfaceProtocol =3D 0, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Quickcam OEM Dell Notebook */ + { .idVendor =3D 0x046d, .idProduct =3D 0x08c6, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, - .bInterfaceProtocol =3D 0 }, - /* Logitech Quickcam OEM Cisco VT Camera II */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .bInterfaceProtocol =3D 0, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Quickcam OEM Cisco VT Camera II */ + { .idVendor =3D 0x046d, .idProduct =3D 0x08c7, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, - .bInterfaceProtocol =3D 0 }, - /* Logitech HD Pro Webcam C920 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .bInterfaceProtocol =3D 0, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech HD Pro Webcam C920 */ + { .idVendor =3D 0x046d, .idProduct =3D 0x082d, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT - | UVC_QUIRK_INVALID_DEVICE_SOF) }, - /* Logitech HD Pro Webcam C922 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | UVC_QUIRK_INVALID_DEVICE_SOF), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech HD Pro Webcam C922 */ + { .idVendor =3D 0x046d, .idProduct =3D 0x085c, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_INVALID_DEVICE_SOF) }, - /* Logitech Rally Bar Huddle */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_INVALID_DEVICE_SOF), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Rally Bar Huddle */ + { .idVendor =3D 0x046d, .idProduct =3D 0x087c, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME) }, - /* Logitech Rally Bar */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Rally Bar */ + { .idVendor =3D 0x046d, .idProduct =3D 0x089b, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME) }, - /* Logitech Rally Bar Mini */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Logitech Rally Bar Mini */ + { .idVendor =3D 0x046d, .idProduct =3D 0x08d3, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME) }, - /* Chicony CNF7129 (Asus EEE 100HE) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Chicony CNF7129 (Asus EEE 100HE) */ + { .idVendor =3D 0x04f2, .idProduct =3D 0xb071, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_RESTRICT_FRAME_RATE) }, - /* Alcor Micro AU3820 (Future Boy PC USB Webcam) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_RESTRICT_FRAME_RATE), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Alcor Micro AU3820 (Future Boy PC USB Webcam) */ + { .idVendor =3D 0x058f, .idProduct =3D 0x3820, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Dell XPS m1530 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Dell XPS m1530 */ + { .idVendor =3D 0x05a9, .idProduct =3D 0x2640, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Dell SP2008WFP Monitor */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Dell SP2008WFP Monitor */ + { .idVendor =3D 0x05a9, .idProduct =3D 0x2641, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Dell Alienware X51 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Dell Alienware X51 */ + { .idVendor =3D 0x05a9, .idProduct =3D 0x2643, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Dell Studio Hybrid 140g (OmniVision webcam) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Dell Studio Hybrid 140g (OmniVision webcam) */ + { .idVendor =3D 0x05a9, .idProduct =3D 0x264a, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Dell XPS M1330 (OmniVision OV7670 webcam) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Dell XPS M1330 (OmniVision OV7670 webcam) */ + { .idVendor =3D 0x05a9, .idProduct =3D 0x7670, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Apple Built-In iSight */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Apple Built-In iSight */ + { .idVendor =3D 0x05ac, .idProduct =3D 0x8501, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX - | UVC_QUIRK_BUILTIN_ISIGHT) }, - /* Apple FaceTime HD Camera (Built-In) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | UVC_QUIRK_BUILTIN_ISIGHT), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Apple FaceTime HD Camera (Built-In) */ + { .idVendor =3D 0x05ac, .idProduct =3D 0x8514, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Apple Built-In iSight via iBridge */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Apple Built-In iSight via iBridge */ + { .idVendor =3D 0x05ac, .idProduct =3D 0x8600, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Foxlink ("HP Webcam" on HP Mini 5103) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Foxlink ("HP Webcam" on HP Mini 5103) */ + { .idVendor =3D 0x05c8, .idProduct =3D 0x0403, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth }, - /* Genesys Logic USB 2.0 PC Camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Genesys Logic USB 2.0 PC Camera */ + { .idVendor =3D 0x05e3, .idProduct =3D 0x0505, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Hercules Classic Silver */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Hercules Classic Silver */ + { .idVendor =3D 0x06f8, .idProduct =3D 0x300c, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth }, - /* ViMicro Vega */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* ViMicro Vega */ + { .idVendor =3D 0x0ac8, .idProduct =3D 0x332d, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth }, - /* ViMicro - Minoru3D */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* ViMicro - Minoru3D */ + { .idVendor =3D 0x0ac8, .idProduct =3D 0x3410, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth }, - /* ViMicro Venus - Minoru3D */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* ViMicro Venus - Minoru3D */ + { .idVendor =3D 0x0ac8, .idProduct =3D 0x3420, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth }, - /* Ophir Optronics - SPCAM 620U */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_fix_bandwidth, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Ophir Optronics - SPCAM 620U */ + { .idVendor =3D 0x0bd3, .idProduct =3D 0x0555, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Sonix Technology Co. Ltd. - 292A IPC AR0330 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Sonix Technology Co. Ltd. - 292A IPC AR0330 */ + { .idVendor =3D 0x0c45, .idProduct =3D 0x6366, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_MJPEG_NO_EOF) }, - /* MT6227 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_MJPEG_NO_EOF), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* MT6227 */ + { .idVendor =3D 0x0e8d, .idProduct =3D 0x0004, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX - | UVC_QUIRK_PROBE_DEF) }, - /* IMC Networks (Medion Akoya) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | UVC_QUIRK_PROBE_DEF), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* IMC Networks (Medion Akoya) */ + { .idVendor =3D 0x13d3, .idProduct =3D 0x5103, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* JMicron USB2.0 XGA WebCam */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* JMicron USB2.0 XGA WebCam */ + { .idVendor =3D 0x152d, .idProduct =3D 0x0310, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Kurokesu C1 PRO */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Kurokesu C1 PRO */ + { .idVendor =3D 0x16d0, .idProduct =3D 0x0ed1, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_MJPEG_NO_EOF) }, - /* Syntek (HP Spartan) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_MJPEG_NO_EOF), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Syntek (HP Spartan) */ + { .idVendor =3D 0x174f, .idProduct =3D 0x5212, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Syntek (Samsung Q310) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Syntek (Samsung Q310) */ + { .idVendor =3D 0x174f, .idProduct =3D 0x5931, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Syntek (Packard Bell EasyNote MX52 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Syntek (Packard Bell EasyNote MX52 */ + { .idVendor =3D 0x174f, .idProduct =3D 0x8a12, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Syntek (Asus F9SG) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Syntek (Asus F9SG) */ + { .idVendor =3D 0x174f, .idProduct =3D 0x8a31, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Syntek (Asus U3S) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Syntek (Asus U3S) */ + { .idVendor =3D 0x174f, .idProduct =3D 0x8a33, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Syntek (JAOtech Smart Terminal) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Syntek (JAOtech Smart Terminal) */ + { .idVendor =3D 0x174f, .idProduct =3D 0x8a34, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Miricle 307K */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Miricle 307K */ + { .idVendor =3D 0x17dc, .idProduct =3D 0x0202, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Lenovo Thinkpad SL400/SL500 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Lenovo Thinkpad SL400/SL500 */ + { .idVendor =3D 0x17ef, .idProduct =3D 0x480b, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid }, - /* Aveo Technology USB 2.0 Camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_stream_no_fid, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Aveo Technology USB 2.0 Camera */ + { .idVendor =3D 0x1871, .idProduct =3D 0x0306, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX - | UVC_QUIRK_PROBE_EXTRAFIELDS) }, - /* Aveo Technology USB 2.0 Camera (Tasco USB Microscope) */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | UVC_QUIRK_PROBE_EXTRAFIELDS), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Aveo Technology USB 2.0 Camera (Tasco USB Microscope) */ + { .idVendor =3D 0x1871, .idProduct =3D 0x0516, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, - .bInterfaceProtocol =3D 0 }, - /* Ecamm Pico iMage */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .bInterfaceProtocol =3D 0, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Ecamm Pico iMage */ + { .idVendor =3D 0x18cd, .idProduct =3D 0xcafe, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_PROBE_EXTRAFIELDS) }, - /* Manta MM-353 Plako */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_PROBE_EXTRAFIELDS), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Manta MM-353 Plako */ + { .idVendor =3D 0x18ec, .idProduct =3D 0x3188, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* FSC WebCam V30S */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* FSC WebCam V30S */ + { .idVendor =3D 0x18ec, .idProduct =3D 0x3288, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Arkmicro unbranded */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Arkmicro unbranded */ + { .idVendor =3D 0x18ec, .idProduct =3D 0x3290, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def }, - /* The Imaging Source USB CCD cameras */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_def, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* The Imaging Source USB CCD cameras */ + { .idVendor =3D 0x199e, .idProduct =3D 0x8102, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, - .bInterfaceProtocol =3D 0 }, - /* Bodelin ProScopeHR */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE - | USB_DEVICE_ID_MATCH_DEV_HI + .bInterfaceProtocol =3D 0, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Bodelin ProScopeHR */ + { .idVendor =3D 0x19ab, .idProduct =3D 0x1000, .bcdDevice_hi =3D 0x0126, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_STATUS_INTERVAL) }, - /* MSI StarCam 370i */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_STATUS_INTERVAL), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_DEV_HI | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* MSI StarCam 370i */ + { .idVendor =3D 0x1b3b, .idProduct =3D 0x2951, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Generalplus Technology Inc. 808 Camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Generalplus Technology Inc. 808 Camera */ + { .idVendor =3D 0x1b3f, .idProduct =3D 0x2002, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Shenzhen Aoni Electronic Co.,Ltd 2K FHD camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Shenzhen Aoni Electronic Co.,Ltd 2K FHD camera */ + { .idVendor =3D 0x1bcf, .idProduct =3D 0x0b40, .bInterfaceClass =3D USB_CLASS_VIDEO, @@ -3052,152 +3171,187 @@ static const struct usb_device_id uvc_ids[] =3D { .bInterfaceProtocol =3D 0, .driver_info =3D (kernel_ulong_t)&(const struct uvc_device_info){ .uvc_version =3D 0x010a, - } }, - /* SiGma Micro USB Web Camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + }, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* SiGma Micro USB Web Camera */ + { .idVendor =3D 0x1c4f, .idProduct =3D 0x3000, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX - | UVC_QUIRK_IGNORE_SELECTOR_UNIT) }, - /* Actions Microelectronics Co. Display capture-UVC05 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | UVC_QUIRK_IGNORE_SELECTOR_UNIT), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Actions Microelectronics Co. Display capture-UVC05 */ + { .idVendor =3D 0x1de1, .idProduct =3D 0xf105, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_DISABLE_AUTOSUSPEND) }, - /* NXP Semiconductors IR VIDEO */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_DISABLE_AUTOSUSPEND), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* NXP Semiconductors IR VIDEO */ + { .idVendor =3D 0x1fc9, .idProduct =3D 0x009b, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Oculus VR Positional Tracker DK2 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_probe_minmax, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Oculus VR Positional Tracker DK2 */ + { .idVendor =3D 0x2833, .idProduct =3D 0x0201, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_force_y8 }, - /* Oculus VR Rift Sensor */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_force_y8, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Oculus VR Rift Sensor */ + { .idVendor =3D 0x2833, .idProduct =3D 0x0211, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D (kernel_ulong_t)&uvc_quirk_force_y8 }, - /* GEO Semiconductor GC6500 */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D (kernel_ulong_t)&uvc_quirk_force_y8, + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* GEO Semiconductor GC6500 */ + { .idVendor =3D 0x29fe, .idProduct =3D 0x4d53, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_FORCE_BPP) }, - /* Insta360 Link */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_FORCE_BPP), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Insta360 Link */ + { .idVendor =3D 0x2e1a, .idProduct =3D 0x4c01, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_DISABLE_AUTOSUSPEND) }, - /* Intel D410/ASR depth camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_DISABLE_AUTOSUSPEND), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel D410/ASR depth camera */ + { .idVendor =3D 0x8086, .idProduct =3D 0x0ad2, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, - /* Intel D415/ASRC depth camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel D415/ASRC depth camera */ + { .idVendor =3D 0x8086, .idProduct =3D 0x0ad3, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, - /* Intel D430/AWG depth camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel D430/AWG depth camera */ + { .idVendor =3D 0x8086, .idProduct =3D 0x0ad4, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, - /* Intel RealSense D4M */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel RealSense D4M */ + { .idVendor =3D 0x8086, .idProduct =3D 0x0b03, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, - /* Intel D435/AWGC depth camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel D435/AWGC depth camera */ + { .idVendor =3D 0x8086, .idProduct =3D 0x0b07, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, - /* Intel D435i depth camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel D435i depth camera */ + { .idVendor =3D 0x8086, .idProduct =3D 0x0b3a, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, - /* Intel D405 Depth Camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel D405 Depth Camera */ + { .idVendor =3D 0x8086, .idProduct =3D 0x0b5b, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, - /* Intel D455 Depth Camera */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel D455 Depth Camera */ + { .idVendor =3D 0x8086, .idProduct =3D 0x0b5c, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, - /* Intel D421 Depth Module */ - { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, + }, + /* Intel D421 Depth Module */ + { .idVendor =3D 0x8086, .idProduct =3D 0x1155, .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX) }, + .driver_info =3D UVC_INFO_META(V4L2_META_FMT_D4XX), + .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + }, /* Generic USB Video Class */ { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) }, { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) }, --=20 2.49.0.901.g37484f566f-goog From nobody Sun Feb 8 12:19:34 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D5392C2AB2 for ; Tue, 29 Apr 2025 13:47:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745934451; cv=none; b=Ja5cch/U93DpFJlp42La5H1fnjvCMCCjMfBrEdY+v0B6nfwV3DmA/1BS8DLOb95PDlcSOiKvkMtlYWOonM7RPKxL2/tJpmuxMevfeqHqfV/4pqX4JNYVBDN8IAFcZPUAxIX4eyvPiYvjq/fquPz5mQRx3drjpGOw3eGBSVnaapw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745934451; c=relaxed/simple; bh=pof8yP94mdDttGxh38mnBzB+VgpR9Ua691PVjYsd7vg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IOv8PGVId+ZE5Y+Zdt26/5o+w/O/a9AdaLYBYlDLHJsj7gL8esZszlCYKFlkvZsOr5n/rI9g6aw+F6xypkhw4dmTt2BhG1m7UP/cIzPpn1Fw7D3gaq1jagwiodN5nO7YytWko6txBSz20kBiV328QiafPs2/giaymFs6ZhtQjSg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=MqJP1k2d; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="MqJP1k2d" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-54996d30bfbso5748327e87.2 for ; Tue, 29 Apr 2025 06:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1745934447; x=1746539247; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=3XSmQ7kUSeus5/Dn9M1UsGJBVKzSt+OwJlM1ExhsSwA=; b=MqJP1k2dMmpljq7hfyaRaNSzl2+sfX2/O59VG5ZLEYflC4gw2yrzflUxfLxXiR/aN0 ogQOdasG9l769F8wRRausRiOjuxDdFUyae8tsZKdajzMDXaeyi/FYFQjTppRh53rjgnn 3gO5swvnIteCJRi+oDrQG9enuq8BoJalAXG5I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745934447; x=1746539247; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3XSmQ7kUSeus5/Dn9M1UsGJBVKzSt+OwJlM1ExhsSwA=; b=UnTUwZ2HNM9BHBZODT9Gjzkz2koFUlGpjpAKimr6r8r8wR5GqO5yeBgOoXHX/+Szvf IbWjCenqfGJdwnFgu9BqMAOmJy1cHIkPvhUbpmq+GrmzkcaWJAxmf3xtpT9dBLLFk7BW x6ixhgGPISzfvcfv9gA2+GW/d1UlOEB9gq+N2ao/KfoC58Rk8RynEgLAc6K39BY+FGyy kAJiCXd11HMxX1cMqcCYCRczser3RtwfExdV58WbUKyG56pfEXbdUaNJHpxtyzTCk0QL d9tOkZEZckMYuLm4OLckSsVywmMqDjkCCOoWPtor/opwRO7Vbx4dpPtyss/wS+o6hDkJ u5Sw== X-Forwarded-Encrypted: i=1; AJvYcCVsvGCQdtCdIe1QqE1hk3Z7nDAsFRewrAnUzh/oibJhLMTrNoxoXsui8029+GONGLCMkp8W3X1J14WK95c=@vger.kernel.org X-Gm-Message-State: AOJu0YxvGXyjzxcLYcQDTDCbXo4Gj8cj6xQgdn849Iy0iBJhzVZP3eNs 5rYdwY59TVMtgJRjzF3BrWmg4nv79PNllzrxJGGe5YWQmDCATAS1d9+JG8t0Rw== X-Gm-Gg: ASbGnct/r7LIMUYvGew5zoLR4OAEQx8hr/gm3uqm6LE+zfB7wVTUVHzikf1FJMJe/AH Wy9APQF79Nha9PXQoTLoa42FgM7uR9IIqbJf/1Os6C/nHHr/xPjuUtMpxIXhduRoMmEHUfag8fb 8gdefH0JA0opIgFqJl7cdVy5DnMDks8vcgQobS6IMyF2wtnBEHBsH5nSOhPQMaFeGqnWg0cBNdQ +bZI1Nd0Ie/J/FgOmkhE4dNm3fj5PsBaqKYZL/u/Bpqd7Y++rIVeXIKXOmkMQ1TyW/2Z50AQ7eJ K1aBzHFCvJBIhdWhAbfOZr+OG7jefEX2xiitxNESFhozPby8qEQEl00WmOMdtAmiCdmXNBxYuGQ quhIuqFH+51CYUXsU12D7 X-Google-Smtp-Source: AGHT+IFYLnU/7fMeN0Gg9PDxITl1rxZMa5y1OVRvGbZ9W4xGotKJbK9Iqb9KCh2ZoNTNWOCeuSZIIA== X-Received: by 2002:ac2:5d47:0:b0:545:8a1:5379 with SMTP id 2adb3069b0e04-54e90001400mr3315662e87.43.1745934447538; Tue, 29 Apr 2025 06:47:27 -0700 (PDT) Received: from ribalda.c.googlers.com (228.231.88.34.bc.googleusercontent.com. [34.88.231.228]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54e7cb2626fsm1902375e87.46.2025.04.29.06.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 06:47:27 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 29 Apr 2025 13:47:26 +0000 Subject: [PATCH 2/2] media: uvcvideo: Add keep-sorted statement and sort uvc_ids Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250429-keep-sorted-v1-2-2fa3538c0315@chromium.org> References: <20250429-keep-sorted-v1-0-2fa3538c0315@chromium.org> In-Reply-To: <20250429-keep-sorted-v1-0-2fa3538c0315@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 We had some quirks that were out of order. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 70 ++++++++++++++++++++--------------= ---- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 7ced8980543af5a207938d12a5eb833ee8a34c38..5f93a586c55936b0b41276b85df= 4456b64662fb0 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2500,6 +2500,8 @@ static const struct uvc_device_info uvc_quirk_force_y= 8 =3D { * Sort these by vendor/product ID. */ static const struct usb_device_id uvc_ids[] =3D { + /* keep-sorted start block=3Dyes */ + /* Quanta ACER HD User Facing */ { .idVendor =3D 0x0408, @@ -2603,108 +2605,108 @@ static const struct usb_device_id uvc_ids[] =3D { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech Quickcam Fusion */ + /* Logitech HD Pro Webcam C920 */ { .idVendor =3D 0x046d, - .idProduct =3D 0x08c1, - .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, + .idProduct =3D 0x082d, + .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT + | UVC_QUIRK_INVALID_DEVICE_SOF), .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech Quickcam Orbit MP */ + /* Logitech HD Pro Webcam C922 */ { .idVendor =3D 0x046d, - .idProduct =3D 0x08c2, - .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, + .idProduct =3D 0x085c, + .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_INVALID_DEVICE_SOF), .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech Quickcam Pro for Notebook */ + /* Logitech Rally Bar Huddle */ { .idVendor =3D 0x046d, - .idProduct =3D 0x08c3, - .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, + .idProduct =3D 0x087c, + .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME), .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech Quickcam Pro 5000 */ + /* Logitech Rally Bar */ { .idVendor =3D 0x046d, - .idProduct =3D 0x08c5, - .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, + .idProduct =3D 0x089b, + .bInterfaceClass =3D USB_CLASS_VIDEO, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, + .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME), .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech Quickcam OEM Dell Notebook */ + /* Logitech Quickcam Fusion */ { .idVendor =3D 0x046d, - .idProduct =3D 0x08c6, + .idProduct =3D 0x08c1, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech Quickcam OEM Cisco VT Camera II */ + /* Logitech Quickcam Orbit MP */ { .idVendor =3D 0x046d, - .idProduct =3D 0x08c7, + .idProduct =3D 0x08c2, .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech HD Pro Webcam C920 */ + /* Logitech Quickcam Pro for Notebook */ { .idVendor =3D 0x046d, - .idProduct =3D 0x082d, - .bInterfaceClass =3D USB_CLASS_VIDEO, + .idProduct =3D 0x08c3, + .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT - | UVC_QUIRK_INVALID_DEVICE_SOF), .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech HD Pro Webcam C922 */ + /* Logitech Quickcam Pro 5000 */ { .idVendor =3D 0x046d, - .idProduct =3D 0x085c, - .bInterfaceClass =3D USB_CLASS_VIDEO, + .idProduct =3D 0x08c5, + .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_INVALID_DEVICE_SOF), .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech Rally Bar Huddle */ + /* Logitech Quickcam OEM Dell Notebook */ { .idVendor =3D 0x046d, - .idProduct =3D 0x087c, - .bInterfaceClass =3D USB_CLASS_VIDEO, + .idProduct =3D 0x08c6, + .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME), .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, - /* Logitech Rally Bar */ + /* Logitech Quickcam OEM Cisco VT Camera II */ { .idVendor =3D 0x046d, - .idProduct =3D 0x089b, - .bInterfaceClass =3D USB_CLASS_VIDEO, + .idProduct =3D 0x08c7, + .bInterfaceClass =3D USB_CLASS_VENDOR_SPEC, .bInterfaceSubClass =3D 1, .bInterfaceProtocol =3D 0, - .driver_info =3D UVC_INFO_QUIRK(UVC_QUIRK_NO_RESET_RESUME), .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, @@ -3352,6 +3354,8 @@ static const struct usb_device_id uvc_ids[] =3D { .match_flags =3D USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, }, + + /* keep-sorted end */ /* Generic USB Video Class */ { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) }, { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) }, --=20 2.49.0.901.g37484f566f-goog