Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3639427pxb; Mon, 24 Jan 2022 14:09:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJyWG2BTBsCVyflLPydOEqwfhtBD/4jdECLtCCW2eFfxW9fZ5U4g3rveHAJp9SuOHU35PTuS X-Received: by 2002:a17:90a:7891:: with SMTP id x17mr374058pjk.112.1643062162500; Mon, 24 Jan 2022 14:09:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643062162; cv=none; d=google.com; s=arc-20160816; b=QnALJSswimOPG7ENtFo5rgyUu+khfSJFoXWM8Rvz8KEFteaxzb4bmqqGZYgDXh1Q1K AujAogcHJqF/k/Vzf/52SoCYEUxGpx5ljajHrO4Nz9DLowjf6qk78wboj3H9J5srpN1i 5B4bDlMOFGLFaih9uGsQm4MIzD5IBb1kL8trMUovGMrlu9jMHbg908KEVHgAqh81FEKH aA450N67/a00xvSnDIRx1eml3+exbsZDzHbmtUH9PQ/2dcVGzk4Ij+7eaUiiwvAT4vuT oj8Dn08eRAsypFuDFYejw0nJvDpFQVPXFg0lp25PgkacqId1mp9zc3oTiOyzbsz+7jJz VMsA== 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=YP1ePBhe8W8vuCyLm0jIp4IkCWWvrtIGXG6F9dQX2zFiT7XOYzuETIL2S6k6huD6yf MmRYiQsljXNEKcSI49FKAefVwBESLy2yeOY92VVQUtY1V4qjINWko3HwgaQaocu9m7on 2Yq6xpWCaCYm8A7Jg/QBirRQQh+VSBVqPLNPKGK57AmlHj/jnDnOY/VvdxVpFhfO3f86 +foYT3EIeyLW8fiyshlvuoBt7utrSS4PQK2yCxdBKWuHD/myFaoIOmX7H5LJzk0Sl7fO Lp1mqT+iWIVfIEb+c0hGM8BJOYSzAHifjAT1lkPgUTzZxNMlEwF3N/9wUMq2snXhOC3q yMxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ro1j3G1U; 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 i10si2568954pla.130.2022.01.24.14.09.08; Mon, 24 Jan 2022 14:09:22 -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=Ro1j3G1U; 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 S1447496AbiAXV50 (ORCPT + 99 others); Mon, 24 Jan 2022 16:57:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1449769AbiAXVQ7 (ORCPT ); Mon, 24 Jan 2022 16:16:59 -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 E74E7C067A40; Mon, 24 Jan 2022 12:12:11 -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 A8E42B8122C; Mon, 24 Jan 2022 20:12:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2ED9C340E5; Mon, 24 Jan 2022 20:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643055129; bh=237rbF9pS7DmapYAq12bvUaL8GTC3vSFTf2z40fMX3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ro1j3G1Uy8lLFqAHH8Ld4VOwnLc4W1hMPj5jEEII5HAPP41+d3gB/ywtumH9Qwpbl rzPVNV8urWB5cUEd/Ffh34JRIvWI/M3dI2Yrru5iMZ/SOhR4G1TGCGlUgkpJpAE1Ai 04IuBDfsiC7I/zKkgWQ5EpBfoFVT4dKmjOoJnGX0= 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.15 051/846] media: stk1160: fix control-message timeouts Date: Mon, 24 Jan 2022 19:32:48 +0100 Message-Id: <20220124184102.713105020@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@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);