Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3691043pxb; Mon, 24 Jan 2022 15:29:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhco9Rr+2eKMkpqaa2bUYcYSoc1quqf6hPxEr/+R1PAYiEx4Dfbg9k9NpPWMPtlCQj2jYJ X-Received: by 2002:a17:90a:f982:: with SMTP id cq2mr677027pjb.36.1643066954486; 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=CiI6VIyCM6cag1hH03YidzP5dXv7yS7MAg8HSaD16aV9oQTP/1pClM0YklgP3rykOG /sVmxe/5H0QduErEJx7dV+qLnHsI/7HzbaSBSUQlRURw7pWN1kb0hzbbWJcmgGCwgyxj FTqhMxGXE3f4AQBirZFtsYeYG+UAAgSgh6V/BgmJWpPARIsBgALfR6lW2uiJc2IVEB3t ASDLHA2sGeBu1B/mld0dtLRYNKtgRHxeEicPmxO9/5IuO5WUCGom6DicOWN1EiPswBQJ Pu2UHivtJUkNmbKVc9478g44+xbG7JJzWe5cnLGq4gGCZpPyVTl7+XFscO4JqlX+Ho/K SVHw== 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=Rn988OqFObrzcQmRe5DBvwBa2iYT3NaaRsg2fpO0o7w=; b=tKBMmGOz7f6lCXxx7vCdadyeS5GQjOom9QCPON3i5lI8eYkYW9gjggW8UHHgcdPXpb s8ZJhfmy1wcpW4GFH1PDv9kqzjXivk4jmPirBoGNLjgYM7vlFUFEGKy46x9CzoND3q9f 3U/pzWMqp4upR7LDWhLFDyK4odowHUmvq9vIm5kBS69PLY7jA7GE8+osSulGi1ni5jVo i3t9uke0YweIAkilaaLoeK8X/ReZB7ErnrBLE8K1fqNEkWdLwhIw6b5dzbzahvq90BfS BDg1jHA84pZPtksfEQfaNm9vyytWXolB8Rw7KbUO7ZfJHinAxv4r9+pRe2me0DLcwez5 jU4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rhAYXAA3; 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 ch22si684996pjb.2.2022.01.24.15.29.00; 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=rhAYXAA3; 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 S1848887AbiAXXYO (ORCPT + 99 others); Mon, 24 Jan 2022 18:24:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1588135AbiAXWbj (ORCPT ); Mon, 24 Jan 2022 17:31:39 -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 3FB03C047CD8; Mon, 24 Jan 2022 12:56:49 -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 F0FF1B81233; Mon, 24 Jan 2022 20:56:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29236C340E5; Mon, 24 Jan 2022 20:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643057806; bh=237rbF9pS7DmapYAq12bvUaL8GTC3vSFTf2z40fMX3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rhAYXAA3xPpidHHXTBjfbHgK698LuceBr0okUezaWlGD6l97ja8YkJVoZM3EmrBjI i+MIAn1chIjNHHArWXELncwD6l3MoMBcHFU1ZQTpK6xz/3j+8dC/USbLkYQSMrgnaD WFyQashOAX3Zs6rY8dGOWDO3jF4UTxKSmTdYklqE= 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 0053/1039] media: stk1160: fix control-message timeouts Date: Mon, 24 Jan 2022 19:30:42 +0100 Message-Id: <20220124184126.924621989@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 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 @@ -65,7 +65,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); @@ -85,7 +85,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);