Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3547220pxb; Mon, 24 Jan 2022 11:56:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzo2VLjCnr5AckMZ1V6hFQ6LtwoJE8d8zBdEaioL81TqN07D1fJiVbcwC7LJ4zO/BmYAeev X-Received: by 2002:a17:902:c10a:b0:14b:4ae1:864a with SMTP id 10-20020a170902c10a00b0014b4ae1864amr6764553pli.106.1643054213364; Mon, 24 Jan 2022 11:56:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643054213; cv=none; d=google.com; s=arc-20160816; b=TAL0R/gWR4tmjxavSYvNw3l84mRbytPLDW6jqkrq+FIuDDtE6i/zvl2J/Miu1tvybe 45TRSSCYmWhY3c/0GJKLyaQQpshq39rx/txth97M5MnU+fLFwd1aOe0qFi7b9rQ4BSnv EXqFJ3JU1OjdoaQ3Ea/b7r5dPE9ZRigJcCgjpGUo9DyJxtszAhX42qpuU9UeORENMPv1 39uUpFV7DqfUlWbqOBbXAHUrVhmboooY9b8sppouqAHdQv65cBKqr0E8XqJpvx9bXK5V lWA3BiVTlLUlS7X/iTU3ePWSndKHWsFTsRaL5U17P9H740ZaNNNa9pv+ivAUzBNi9CNN WpCQ== 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=AJDf6ztsxRTVV+ksic7SvzCyGbeGvDK4K0ImBPAkAPc=; b=G7pFvtQTH/g6freAZ6J5FJDO2Dd2ELpUDnfAKB+6xlRoCoGwfAkAWJfkKGZJjlL1JH BYvUPeVPJn0fOVVEX9nGSRCpLhs7k2zELHGMArZgy9tZDZvSQ3XzxiU3NTYnfB0ameF7 Co2Cd+le7v0N3zquzja15l0/xCH7Q/XFjzjarzMAXSY38lXfZWTt2yUdKkUYX39OlB4O zxcCg5FUtrwRXqOlItsz01/OzcTD3uCerE1BmfUUgjQL1U2Rs9vL7576DNwqlFi4c11x gNNIJf0Btax3tO+ENDKdYPck7W/5o3jL1W0lJDcptyViPKl0DKR3h8qAtyMfHNH2aDQQ SUGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="j/qFVMPp"; 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 t16si211921pji.152.2022.01.24.11.56.39; Mon, 24 Jan 2022 11:56:53 -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="j/qFVMPp"; 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 S245679AbiAXSuW (ORCPT + 99 others); Mon, 24 Jan 2022 13:50:22 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:49550 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245487AbiAXSt3 (ORCPT ); Mon, 24 Jan 2022 13:49:29 -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 ams.source.kernel.org (Postfix) with ESMTPS id BB6B6B8121A; Mon, 24 Jan 2022 18:49:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D552DC340E8; Mon, 24 Jan 2022 18:49:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643050167; bh=MH0E6NCxT8S0JirUSBlxUe9H0Emh2ArelTUEIROEmLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j/qFVMPpL+T9rEI8FjSFew5b4iyA56JOFoDk56L7JCrfIBqqYB1odrWw/NB3LeCxq zMDhj0Zy2uxmWmYix5IcM2Usi486bk8k3B3z14Xk9Yi2hjbVxAJJdq44Ygg5/C43cl ZoNKitaYmWv8fv6q4AVRRUbrixkbRJdyZ6kbPCto= 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 014/114] media: em28xx: fix control-message timeouts Date: Mon, 24 Jan 2022 19:41:49 +0100 Message-Id: <20220124183927.552845234@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 d9b7e8df3aa9b8c10708aab60e72e79ac08237e4 upstream. USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: a6c2ba283565 ("[PATCH] v4l: 716: support for em28xx board family") Cc: stable@vger.kernel.org # 2.6.16 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/em28xx/em28xx-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/usb/em28xx/em28xx-core.c +++ b/drivers/media/usb/em28xx/em28xx-core.c @@ -99,7 +99,7 @@ int em28xx_read_reg_req_len(struct em28x mutex_lock(&dev->ctrl_urb_lock); ret = usb_control_msg(dev->udev, pipe, req, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, reg, dev->urb_buf, len, HZ); + 0x0000, reg, dev->urb_buf, len, 1000); if (ret < 0) { if (reg_debug) printk(" failed!\n"); @@ -182,7 +182,7 @@ int em28xx_write_regs_req(struct em28xx memcpy(dev->urb_buf, buf, len); ret = usb_control_msg(dev->udev, pipe, req, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, reg, dev->urb_buf, len, HZ); + 0x0000, reg, dev->urb_buf, len, 1000); mutex_unlock(&dev->ctrl_urb_lock); if (ret < 0)