Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3691144pxb; Mon, 24 Jan 2022 15:29:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8HJrKuEEiuNXxdvui/qikEVS64vcBXAsWPe+9jSMcwr97Sq7oX0saiT+9avRyGTwrTp/P X-Received: by 2002:a17:902:8604:b0:149:1a90:db8c with SMTP id f4-20020a170902860400b001491a90db8cmr16744580plo.62.1643066963400; Mon, 24 Jan 2022 15:29:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643066963; cv=none; d=google.com; s=arc-20160816; b=xX9XvJTSy2uL3A8naxiLfeVQa/YpgulVxP8m4/e2yOnExkuZaDyWVgowLL3vFTHuDE ZcvMtHVQHbN+ygh9ttKiV118BSesQmiFs8kSV1oiKZ+F78Z703paD/uhP3OxnsmpxNEs 7uJA81dFGxyIWWt8/BvDinaj5wTrdZGforI7wdY4OEriE33bvh9TJWrEcj5zUH9Degcj K4D4+MSrsZAGbI5pq3BZMXTiOawnAKHVdUTbryJoluG86ppZZ6kH5sX+bao35p8SkQoX BRWzGsn/ugITAVR9cdUcMpIGllioIZvF9Z9HVeMOnTxG6qpbSg67w0vLomLBZ6tkP0/g +7ew== 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=jpU72TyPHN6zJzxCNkmBsvv6TRVB9VWRZKNVG3pRfD8=; b=SUyQ9uV+tWYPB7xOZsBoa6qi0ck6WPLd0Q6hHgN/aEXztWODm1VG2rlqAmtPtLs/NF H4cyo3aCyjEYrrZbSgq/I5eK0Pmi/vdNi1xglO7+p6LhW6CXjuLZCdfeU5FIwkjc6seA kxdoWWaHjNLF+MO9jJDC96oI44wSFhTs3S/3eKo/CvJ/cGuqpCV0nmBKopu5qynKO9Cy dXVHxrEjODJ61hVMGyOd1CLneUH4pJYxMJ/Aslsw2dbNaiAOpb9f3bLDi9Z+QgWsF4SQ Jw2OJv93LBBib7MgYWk4GRfDLyXsJK/riWSZHigemStK9jNtQmgddUhfL6js3WHhU7p5 eCFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v5SwpL6H; 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 v8si7541845pgi.789.2022.01.24.15.29.11; Mon, 24 Jan 2022 15:29:23 -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=v5SwpL6H; 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 S1849356AbiAXXZf (ORCPT + 99 others); Mon, 24 Jan 2022 18:25:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1587648AbiAXW3X (ORCPT ); Mon, 24 Jan 2022 17:29:23 -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 C2354C0E5317; Mon, 24 Jan 2022 12:54:55 -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 7CF6DB811FB; Mon, 24 Jan 2022 20:54:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A467BC340E5; Mon, 24 Jan 2022 20:54:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643057693; bh=lDnMZdm1qIoBNi8zGpb9L19ogrWHp8r6Rf4WFn0gvus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v5SwpL6HmfH6xkfGVtF/PGNvQc097KEA05BNCL506Z/GYYPl5gtRbvT7vMYtos0hH GmmFfYEEhaPQR37H+IY5nb3p8+ND8hGYarF4k3qzZmiEfUS9UAFtJ3ug3NxbIKVrTR bqXNDj4u2Ss5Y+OYVYqkm2hC1YNQ9KiArMS0WjvM= 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 0047/1039] media: em28xx: fix control-message timeouts Date: Mon, 24 Jan 2022 19:30:36 +0100 Message-Id: <20220124184126.723948858@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 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 @@ -89,7 +89,7 @@ int em28xx_read_reg_req_len(struct em28x mutex_lock(&dev->ctrl_urb_lock); ret = usb_control_msg(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) { em28xx_regdbg("(pipe 0x%08x): IN: %02x %02x %02x %02x %02x %02x %02x %02x failed with error %i\n", pipe, @@ -158,7 +158,7 @@ int em28xx_write_regs_req(struct em28xx memcpy(dev->urb_buf, buf, len); ret = usb_control_msg(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) {