Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3624660pxb; Mon, 24 Jan 2022 13:47:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnQZZWu5CgUYLxRvp/7IMjSLBpQoA57UVt5bt/G3ShM9njACz3obFqM/uefNsl/qaSum4t X-Received: by 2002:a17:90b:1803:: with SMTP id lw3mr302481pjb.114.1643060787912; Mon, 24 Jan 2022 13:46:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643060787; cv=none; d=google.com; s=arc-20160816; b=lyYXmkVWl1CGmHR25VBM5QQ8EgCGkX2DsV7hVnlCez8VHZhN26I3QYo2nesDTuWXrb pni3PcBrKueWPugAG03WlU9fVNkzFHgJKbmVdf0+mby0sxHvqLwNHjpIr5Dt/4xAQb62 lV07AZeX46b+sjsZRwZmmdGrGqrEEbAgi+dZyaQQb306R/FhBnZpLp1jjbCEEtsGVgPx H68ZWUXgHGoQhjVq+5anOmApw/U42D8tY1KEwuAeeJVAZBMP5gIh62+0FclnhZ7SJbp/ E0hxAuCbjs4Pq7ky6CbFVUqxub7qNSqnpbvZLEWjLhUTfg0J7dtTGpsjjHvW49j8T6vp A4og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jS+R0bauBVbzACaY9iKkw578ct6RPAY8XNV4AU7lHzE=; b=UYxaWOxn8zBJaH6uR+vaVV2oh6GSl2GNrFQTAPAva3FpEQwITxRy+RFVzNTOMR5rbz Dq4PZfWNrQ+Eq0+uYqdUtvQhwhM69O8SPEz+r+jg4emlyt1dvAaiGyAJY7uY678RcEoq kWJZiDYYV3qfe8LP1s/xam3DXjsG8H6SggUdiZu9sZhT77KMaC+BAPW9N/LOu+eyPedi VmMjkwBgYvxSDKGr5BmEE+y1C/j4VSWRA3YfcoedXIO0Nf+jsGemJheIp3Aaddq8Rhms nUwbI1f2MRbLwCk4N/KUXypPovvpL/GRnMPeJtLoprGuBrF+PlA276Kpy8uMaNtccK+0 wRpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=upMIpHhk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bm10si4524258pgb.28.2022.01.24.13.46.14; Mon, 24 Jan 2022 13:46:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=upMIpHhk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1452673AbiAXV0H (ORCPT + 99 others); Mon, 24 Jan 2022 16:26:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1392314AbiAXUvC (ORCPT ); Mon, 24 Jan 2022 15:51:02 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A1DDC054310; Mon, 24 Jan 2022 11:58:16 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 3919260B43; Mon, 24 Jan 2022 19:58:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1487FC340EA; Mon, 24 Jan 2022 19:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054295; bh=ixHiAAhTeUJ3CTD9gpQ0BpOp0z4g1efWh7BF2ublt54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=upMIpHhkNmWpMaX6NU7iZtLVorcDJt4SdV71UbpnYQSAlzxC9LtXsec5H81r9tfKk MT0TKK8mKXiXHKucX0nGuXy8KtGx9QOaMjtBoH51wt3+9+nwt4LOBvsWpvv24obIns RyKllc98E57kE2z2b0GI0jnaSW/3GKzsaP3u7WPk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, James Hilliard , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.10 342/563] media: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds. Date: Mon, 24 Jan 2022 19:41:47 +0100 Message-Id: <20220124184036.250507367@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 a3dfacf069c44..c884020b28784 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -183,7 +183,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