From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2846FFBF2; Sat, 3 Feb 2024 04:17:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933857; cv=none; b=oASJ1zLMacwFkXxYSdRHu/UYWW3rTWMBXDKz9qcQh4a/z25ED2Oswe9Q6PTBOqzAhhmEkG2V36RHMyfvYaaugzNv3N/NtP+uaHUGLlCbbZ2mmjuTANsUnjyieZ1VvpEHuNV5Uj9rUE9z6cy+xoce7YOpiPB+hwoPceJqZtV/OSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933857; c=relaxed/simple; bh=18ATDsmaFSEJ7fE+RVzQSvC+/n9C+yDEDVhrLaFVBG4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W4bh0veCAbwMjI1LiP2utgxl4CJjw58DjczhEtBa5ozIItl5Ykb/dLa7VWE/ELjrBCPW4oW3po70OTiW02gn05bOAFm5S7gtwzAY6d2prxmtw+9EgEJZtrPmsrk2GDcBXyTS6fFJCE8ZVrsfFc15U8eYn6/zHx28zpFlJivDOCg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=B4lMrY3u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="B4lMrY3u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E24B7C433C7; Sat, 3 Feb 2024 04:17:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706933857; bh=18ATDsmaFSEJ7fE+RVzQSvC+/n9C+yDEDVhrLaFVBG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B4lMrY3uQTK5nfX0FIzpzs8qVTy5xwIrnWWHxjOf1JiCsS+u909LBnpPALEn5WfNU Dm5dIrOt8AEkKQRId6H+wwU/KikH5H6qafyFC3wQSZyBjOpavHttEdUz/QuC3CcQsg ZTXfgkQ0OuPyX6iWjUKjU0U3Gcz3WFAdVgL5B2lo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ricardo Ribalda , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 6.7 188/353] media: uvcvideo: Fix power line control for a Chicony camera Date: Fri, 2 Feb 2024 20:05:06 -0800 Message-ID: <20240203035409.612853711@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203035403.657508530@linuxfoundation.org> References: <20240203035403.657508530@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ricardo Ribalda [ Upstream commit dba3e701917a4cce92920f8ccb9fa4d4ee5ac07e ] The device does not implement the control properly. Fixes v4l2-compliance error: info: checking control 'Power Line Frequency' (0x00980918) fail: v4l2-test-controls.cpp(552): could not set valid menu item 3 Signed-off-by: Ricardo Ribalda Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 08fcd2ffa727..4b5ea3501753 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2592,6 +2592,15 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited }, + /* Chicony Electronics Co., Ltd Integrated Camera */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x04f2, + .idProduct = 0xb67c, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = UVC_PC_PROTOCOL_15, + .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_uvc11 }, /* Chicony EasyCamera */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, -- 2.43.0