From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48E3FC433FE for ; Tue, 18 Jan 2022 03:13:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345138AbiARDNk (ORCPT ); Mon, 17 Jan 2022 22:13:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350275AbiARDI3 (ORCPT ); Mon, 17 Jan 2022 22:08:29 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51A1FC06118C; Mon, 17 Jan 2022 18:50:12 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0C13BB81195; Tue, 18 Jan 2022 02:50:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BD19C36AEB; Tue, 18 Jan 2022 02:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642474209; bh=N8LyJ0PBbd2eAEokv8SFCwHzwDSLj3fGyV6Q+dDmoeg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g0UQeoNTwXtRTcLcw2UvGjdogy35SDcYYzmlOOifsobXZIXoCb1VT+moWKzgGgSPV p6Njz14aH0wq0rELrcLAt7sjgGkEqJaFY7I81xJSqINrasBuVuCgwRkpkrA0zKfwmN DTYf+ohTSrLDw/qnUDLZFk8EIGdIi1cVcF1eTijHsV0rkhbZireF4+enDg93PEGMz8 nKIPAKWmVIS1/V4cFLq3nInjN6sSs9VFa5Q5QjOdI0/5cwBAp2sGMkY0z3rGWZa1X0 cAw7k/ayNL1dqKAkH/cWACGIuOyI7XBPbbV0p1ZyFS/bosJDsO4vJqGVbQ1+FdcnIv 2oewJQhXR/Rfg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: James Hilliard , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin , mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 24/56] media: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds. Date: Mon, 17 Jan 2022 21:48:36 -0500 Message-Id: <20220118024908.1953673-24-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118024908.1953673-1-sashal@kernel.org> References: <20220118024908.1953673-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: James Hilliard [ Upstream commit c8ed7d2f614cd8b315981d116c7a2fb01829500d ] Some uvc devices appear to require the maximum allowed USB timeout for GET_CUR/SET_CUR requests. So lets just bump the UVC control timeout to 5 seconds which is the same as the usb ctrl get/set defaults: USB_CTRL_GET_TIMEOUT 5000 USB_CTRL_SET_TIMEOUT 5000 It fixes the following runtime warnings: Failed to query (GET_CUR) UVC control 11 on unit 2: -110 (exp. 1). Failed to query (SET_CUR) UVC control 3 on unit 2: -110 (exp. 2). Signed-off-by: James Hilliard Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- 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 05398784d1c89..acb9f95127eb2 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -167,7 +167,7 @@ /* Maximum status buffer size in bytes of interrupt URB. */ #define UVC_MAX_STATUS_SIZE 16 -#define UVC_CTRL_CONTROL_TIMEOUT 500 +#define UVC_CTRL_CONTROL_TIMEOUT 5000 #define UVC_CTRL_STREAMING_TIMEOUT 5000 /* Maximum allowed number of control mappings per device */ -- 2.34.1