Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3558092pxb; Mon, 24 Jan 2022 12:10:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsf3rw93b/4EW/NYDvomW1Ah9PeyJSr4uiTei0OM/q8AIexFnjilkeUWN5+OC0pc45EKQ6 X-Received: by 2002:a17:902:bd0a:b0:148:b21d:bf92 with SMTP id p10-20020a170902bd0a00b00148b21dbf92mr15678626pls.16.1643055055462; Mon, 24 Jan 2022 12:10:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643055055; cv=none; d=google.com; s=arc-20160816; b=oBxTnCkzIZyu95CtN3eoqUCkHJbnZ/fGU6QVn7170LiA2VESwi5/XF6a7FHlAc0Di2 BG2QfKGLY1FgV/crP0tbgKx75tCmi45j78TdHKoMZ8Bh2c44AyTm9BX2i14H/Jadp090 w8Z9VHkHbxMvm4e3boyTM+vxrN5dwBoQYQgFrdQnyuofRC/XMLhS52HwfEkFM3nX0drX oC1CVar4H/7Yox859Yddb234wW3LA9Z+J94/Zw5WJYDzuwBrd6o2/zf6qvMhxP0WZMv8 Po3cnOEFjzsrNtiYrZ22M5j92AkIcKNyqlJKqMsPqg50VwQf5OKU8LthYjTewtaIUXsa 3z3w== 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=vCbqbBVN3ZtKi9lvTt10wtGQ6Oo8mngHjxVsovx4dE8=; b=H2xFliPYXxqNSqpInDovr536Gmx5uxYUF/S84vyk+xuzYtNzRTN3kGSXemgdmJ6BtY LfxcaV9KRB++tcpGuai1axyRZKt+MCu6pnCYpbLh1aoZWj4U/pSNWzoFqxlQ547/vGdu 4by5pFhz6XDZqOxxbasDU+3SR+XW+xLyA/QVvgy3Ts0eC7HyWhrBheyBRfCZkTk4ViKY ByIqbkrrf/JOAVTwmMWpBKQgWT8NMCcZAW8wmfpqkmRp6SHv2gwpc6qEAFOMORFAw+yQ GRftYCOCLQP0S6XNNpRUg5eSTCpaWAVX6lEyfG+llZWrZ7gVbPrr/pxnmiLoqy9rBKQ1 SHGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iIjd7gCg; 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 y124si14400569pgy.605.2022.01.24.12.10.43; Mon, 24 Jan 2022 12:10:55 -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=iIjd7gCg; 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 S1346569AbiAXTMs (ORCPT + 99 others); Mon, 24 Jan 2022 14:12:48 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:33906 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345514AbiAXTDo (ORCPT ); Mon, 24 Jan 2022 14:03:44 -0500 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 494AE60BB7; Mon, 24 Jan 2022 19:03:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0608EC340E5; Mon, 24 Jan 2022 19:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643051022; bh=APWsZhwa5pVHhTAULT9fAjfDNrVdk3v3541Ngoypbog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iIjd7gCgcro2wAkd6anhXkk/pOrMB9v3b31HOAKViH+yi7NedquXQx+2L7I57XFLh 9C0NAI6IRpcySfDojlvsPBqSy2IEVbc6qUJEf7h4J22eqtFb9Gh/WtbrOwNbVd7T7B Xbtv3Fp5uL+y8I8aqakfAP6EXyIIGyhLHLwGwJjs= 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 4.14 029/186] media: stk1160: fix control-message timeouts Date: Mon, 24 Jan 2022 19:41:44 +0100 Message-Id: <20220124183938.057625168@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124183937.101330125@linuxfoundation.org> References: <20220124183937.101330125@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 6aa6e70cdb5b863a57bad61310bf89b6617a5d2d upstream. USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: 9cb2173e6ea8 ("[media] media: Add stk1160 new driver (easycap replacement)") Cc: stable@vger.kernel.org # 3.7 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/stk1160/stk1160-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/usb/stk1160/stk1160-core.c +++ b/drivers/media/usb/stk1160/stk1160-core.c @@ -75,7 +75,7 @@ int stk1160_read_reg(struct stk1160 *dev return -ENOMEM; ret = usb_control_msg(dev->udev, pipe, 0x00, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x00, reg, buf, sizeof(u8), HZ); + 0x00, reg, buf, sizeof(u8), 1000); if (ret < 0) { stk1160_err("read failed on reg 0x%x (%d)\n", reg, ret); @@ -95,7 +95,7 @@ int stk1160_write_reg(struct stk1160 *de ret = usb_control_msg(dev->udev, pipe, 0x01, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - value, reg, NULL, 0, HZ); + value, reg, NULL, 0, 1000); if (ret < 0) { stk1160_err("write failed on reg 0x%x (%d)\n", reg, ret);