Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3586192pxb; Mon, 24 Jan 2022 12:53:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKwfwdJkx8goOYOpJ1inZ5nK99Yks1510IrmJxggTQGIY8T2+sVK9Dh58sew+9Fbgq/oEY X-Received: by 2002:a62:cd89:0:b0:4c9:b1f4:e68e with SMTP id o131-20020a62cd89000000b004c9b1f4e68emr4892989pfg.8.1643057597100; Mon, 24 Jan 2022 12:53:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057597; cv=none; d=google.com; s=arc-20160816; b=x8fjhJQjgIaoGMBadP4e5T0TUvJEVIfvLCp3IRO3VRWArxAH5l4EidLgfCMCH2nc69 AuwDk1EcpUNH/YkML7NSxGHGLFgUzWwfXO4sivvbXC4CnSzOGkJ86Z9e/QD0KFTvQHge ACFx0B20OnQW9I7JiXRDmaYoKMqy/czxkKUShsIMw0ILm8UErQ3G884aa5M/hdiBZP6T 2ffg7C5SfFHXtUGQ+ewDoXrFoeSWipT8KKEY7zU+kzoIiLAqWgEnheukI1lJaylByXBa LuCT9fXdkM7PoTN5fXAH3RVVgGWV+6czDU0OyzM9t/0OzGXd6JgnZZDMyzReFwJQ1hZU Pxig== 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=Ym1iN38HFCK+kswFpHF8zxZWGF8aCRRlOlG0vGfqEXeBYnrTrfJ1rrkNPNy0L25nv5 lfBzdB8wRtIdOi03s8u1Ur2p+v4tRA1Txngc5Bzo+uudN1J4QZ0WIqcWJu26aIWQEDFX RutB8hNHoSGRaPWw+8suPE8ZvO60XH7ztP9eyqLwQysoya9FzhDFt9cCspA2mvSavNco B1vjyVx8Rjdkc7WJ78c/0ujHk+R7weS4sEJR1nT/i+CjxBkZF8+rhfMn0h1GArzc4gja fbL5nVeX0TxG/HvePL4XVoDrX9AqFMeod7NYOKFv0KlVTUFb6/EQsoxSyvpU2mc+7tc/ ZnKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="DOhg/0Jy"; 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 d8si8533195plh.148.2022.01.24.12.53.05; Mon, 24 Jan 2022 12:53:17 -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="DOhg/0Jy"; 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 S1378829AbiAXUJy (ORCPT + 99 others); Mon, 24 Jan 2022 15:09:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348026AbiAXTwN (ORCPT ); Mon, 24 Jan 2022 14:52:13 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E964CC0617A6; Mon, 24 Jan 2022 11:25:10 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 89DBD61490; Mon, 24 Jan 2022 19:25:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6227FC340E7; Mon, 24 Jan 2022 19:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643052310; bh=lDnMZdm1qIoBNi8zGpb9L19ogrWHp8r6Rf4WFn0gvus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DOhg/0JyenJHizcZQTF4cIjiaYP3/PVCvBrw2TW6Bqvv1J4DZNgF65XwJzu2gQW1V ud5F1eCTCm/8Vy8LLcC6wS6S6XWcODjrravEP5TabOTHEYHyE+8Xfsz9g+h7ivjcb8 LEyC9HHBEtWzGHNVA5kTZix5SMteHYcbPwOFcMS0= 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.4 017/320] media: em28xx: fix control-message timeouts Date: Mon, 24 Jan 2022 19:40:01 +0100 Message-Id: <20220124183954.337288425@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124183953.750177707@linuxfoundation.org> References: <20220124183953.750177707@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) {