Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3547603pxb; Mon, 24 Jan 2022 11:57:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJztHMwCWiHgzEqjjZRh5eXDhkdJpDhFfMbT8MdcG8jkx3GYHSaSIoZX9Vfrpktt7LiY/YEj X-Received: by 2002:a63:8ac9:: with SMTP id y192mr2154088pgd.371.1643054246829; Mon, 24 Jan 2022 11:57:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643054246; cv=none; d=google.com; s=arc-20160816; b=mvWJMSdfOUKIDIkm39L8Ehz0x9dRMjJqEZos/yEtc9czF0GQGDICcZd54haBYQW7/L c1Ls7tGj8k98sFIoAVjuGOtriMyoPqfFpuNK51jVwc1ysoHvmDBo9Gg0xBS/XdQiGbFH jA6no+93KeTM9EF2JBD9D3X5X1IBpexrfclpRjUvAEk0CHOPDZScBzC9vHQNhDPkwcLT LrWvf2HiuanYoIzZrpFxLgveYm3SDl3fLxlp5zn94ereHf/i/ZEEvwctokOFw2S2nOQ3 T5SKg6e44vZpeNbSRw0DbMmoJ/DEV5ExrpEmkLWIry5VO53/6wFXsIAwuxyafWxOzZxJ qaWg== 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=dtlburR6AhrGSg0ACu9MljQSIRRHAwz8MIoDH/iwhCQ=; b=vzt296emJjr1G7NTrlp+NdbQ1Tkl/VQAMozWxrkHhOfGEdh9ajqghl7xaZeQTYTOcn RXIZXRBoxPGBZh8hcNB7CIucx688qvrlfgy3OLSdD5MfkWNxb3zOP4VnhZWr+hesJqLP v7FcL8ByGdSYiRVsKxBxauumOOMhfzK5xWrNpM/Nlb5uiKS8Yl4KBgYpyOKBDZb9nN/u 5Yb+B4PEt0NnSNsx+vkNh2v88GsmIsNpeyoexPeihzjlF56vdY26fDxTFbuQ1Zc6YXjJ m/VXSrPqHBZ4ojpoYXDYt948Cw3Blq34WG9vLZckvV69atN3jcgUSimQjiJbPbmYE4yn +yow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OQJeU4Du; 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 j28si14422835pgb.379.2022.01.24.11.57.13; Mon, 24 Jan 2022 11:57:26 -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=OQJeU4Du; 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 S245511AbiAXSvj (ORCPT + 99 others); Mon, 24 Jan 2022 13:51:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245399AbiAXSua (ORCPT ); Mon, 24 Jan 2022 13:50:30 -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 84A21C06175C; Mon, 24 Jan 2022 10:50:29 -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 434FFB81221; Mon, 24 Jan 2022 18:50:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 743A9C340E8; Mon, 24 Jan 2022 18:50:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643050227; bh=+JGX5V6bckuGbkPso6Uwk7DIgB1lnA95aSlFuON2aDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OQJeU4Duomf0w4F0llnz+DqbeK/7wjSugIvDfr6iAWkoZYWOocPn6qlO1eH5RYqxg VUdQ1h0RurDx5V5SL/rPSUioAca6iKYR+1yT8gPiTmbJxSBPAQPFD6nbGtx7dSPTmp gg3i78tQYfmZbdHfaFBF8jWJfxx29dHNQNXtYqvw= 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.4 017/114] media: stk1160: fix control-message timeouts Date: Mon, 24 Jan 2022 19:41:52 +0100 Message-Id: <20220124183927.645730424@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124183927.095545464@linuxfoundation.org> References: <20220124183927.095545464@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 @@ -76,7 +76,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); @@ -96,7 +96,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);