Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3692241pxb; Mon, 24 Jan 2022 15:31:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJ7zASxb9AUCAjoNqv0xQrdHIMa0UxRVfbJO9FIwdOoyddL+R6QcHJ326WmnS7SKQKetN9 X-Received: by 2002:a05:6a00:1a15:b0:4c2:838d:e9b4 with SMTP id g21-20020a056a001a1500b004c2838de9b4mr15865084pfv.66.1643066954705; Mon, 24 Jan 2022 15:29:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643066954; cv=none; d=google.com; s=arc-20160816; b=s8BLiX2Fjxgl64i46fj43ZYfNd37IQCyyZtKbyDL5r/7DrTJxtMn671hZpQBi/v7nt S4SGxhkD9oQG5PUwkKPghHGo/lgKfaRyCkwJX48TcMg40a5i9HXtsQ+Mcwqas24PJWL3 TBp9MY/rRcbCRCUm8wx3DVshkp0Unmy+D4EZN5rA1c1k2NzFTkN16Nm/BgIbwdpFlxoH hK+UVjGo978xistjwqJIi7C31ZMHvmS0sRIP9cUGm9csuEBvtQKF1V/57CJAzbdc2ulH V++C2gZORoIWsXMEQL2Pv35lgo5cLjMjJbwNKbzCBKXASy1lousZ9+BdHo/LDSegvbqO vheA== 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=sU+M5iXdmNMQADEvBOeKS17DWOLjJF7EbCvkA+x2tyE=; b=LfKCZInMfs4ICfIlqUmbBL2jHX+jFL+ETxWfyRcK/zsWHYVm2YAVB2KOwSepO8bHDp APIi47y84bkaTsuUP+hiIysNawU/pM5rKqN6xY2/Ksjak64SH3bOqDXMusH5ZZPgTjay 2uqYgNYprn8r5tFyJHXbcnnJf2zDsa6wOTqhNw2CMC/+TvkNGUlUbIj1jsvJBVYcAxH9 mbOqTKpluQbC8CnDrHO0EYa4NqR5PDHbNuHt25mvEmmG7GjILOLMTfGNItijG2IvJHid TAyIqICz9XBD3sWnzmPQiL9Ua/o59fJJOrdsBDgDwpq7/sV3AqN0pcgHx0o/3feWBQhA 0vEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="SEhqJ4/d"; 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 l1si1056938pff.40.2022.01.24.15.29.01; Mon, 24 Jan 2022 15:29:14 -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="SEhqJ4/d"; 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 S1849080AbiAXXYl (ORCPT + 99 others); Mon, 24 Jan 2022 18:24:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1588129AbiAXWbj (ORCPT ); Mon, 24 Jan 2022 17:31:39 -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 58BF5C047CD9; Mon, 24 Jan 2022 12:57:03 -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 EE98260907; Mon, 24 Jan 2022 20:57:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6018C340E5; Mon, 24 Jan 2022 20:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643057822; bh=qfAGAbyPTg3olyE7z+5FG/FBdquTGx9E7vNPDPs2aZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SEhqJ4/dO2T/T/7XKyrIdXgo/MlJdn50PIJIkoARQGy2Q6gMXbatptiQkQF2x/Gk9 lvqx9lTOPwM2M8gjD0ZxyqfRPtm2hJ7D5+l/nTyP4wOnx2bZ2kbeZsmi/L0vK0PA+j pJavPqbOKRLT0i2OGjdbUoNYKD4/QhsDf7cJIFJE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 5.16 0048/1039] media: cpia2: fix control-message timeouts Date: Mon, 24 Jan 2022 19:30:37 +0100 Message-Id: <20220124184126.757371888@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@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: Johan Hovold commit 10729be03327f53258cb196362015ad5c6eabe02 upstream. USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: ab33d5071de7 ("V4L/DVB (3376): Add cpia2 camera support") Cc: stable@vger.kernel.org # 2.6.17 Signed-off-by: Johan Hovold Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/cpia2/cpia2_usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/usb/cpia2/cpia2_usb.c +++ b/drivers/media/usb/cpia2/cpia2_usb.c @@ -550,7 +550,7 @@ static int write_packet(struct usb_devic 0, /* index */ buf, /* buffer */ size, - HZ); + 1000); kfree(buf); return ret; @@ -582,7 +582,7 @@ static int read_packet(struct usb_device 0, /* index */ buf, /* buffer */ size, - HZ); + 1000); if (ret >= 0) memcpy(registers, buf, size);