Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp124288pxb; Mon, 25 Oct 2021 05:13:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVIhJsUKEHak8yB/yQK+XyrnJNLhuO6zVYgaosNMgqYKfIktEIM4de4ZTBQSFws2Bm3s2j X-Received: by 2002:a63:894a:: with SMTP id v71mr10499721pgd.451.1635164011854; Mon, 25 Oct 2021 05:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635164011; cv=none; d=google.com; s=arc-20160816; b=cVkkX0qBnQZioyhasNXT6W+Vb59DmuLM7UnNPQVql3j+EbZ3le29I/Pp4NowORmH5d pJkfWaw9PkhAKOnX6iBOUHB9eK1cdvz8qpV5OFtHZxGMg5MLCF0fR+gkyOqPEZRM8DwB 9IkrUXCxNJEo4fOL6ShTjwNHAsOeM9yccSWZu4U7+RVRUzd1gsupFxdA5Ior/8zBEhCy 2tVshEHMb9HSC3jIchUui+rtOf5Qt5oCs8ReStlfvDLEhBVMlHSMVtaUp8AlgvHHaKuX 0/UCHoNEzWeIcd7me1o+9tUgxh+cLvnpaW26GmFWXwciox1n7Lxh6ZqrCoAg6tyXc20f x/7A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ymijxpSR6zfj9pJwn5/HEJx0NQ0F5ZHX2OOvij5slvs=; b=F0g7YMbPtZ1jOABSOuzwH3idCDNcr8FLjlWmddH6AW7HhdL5fY4K4k2dVrKndyNoj4 aEM24P7GwTE3sHh4MSQkNAArGZv6uO2XuQIKXhgC+lXJsbtqoK5B5AKhi0OxrWd0P2Ka +piZ4XZd284i5qJ8UgzjPf4rK4gpb63K94pnmsPVfuyv9YhA4q/zEMA3zv5psXKRxuPQ l+g3JjaALAtZdF0zdlgycndVIF5TOXPrdBa4dzV8DNcRrWaPpFkWIBPkMtyGeN5E/+88 d73epI7eWd2fT0ZqGJwGIGpugcGi5VQRA9x8EV8oI//VToXDgLcUKmhT4I5O+EvQ0f6v aHGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="NBk+U5/S"; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z2si25573260plg.183.2021.10.25.05.13.15; Mon, 25 Oct 2021 05:13:31 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b="NBk+U5/S"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232905AbhJYMMC (ORCPT + 99 others); Mon, 25 Oct 2021 08:12:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:51188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231358AbhJYML4 (ORCPT ); Mon, 25 Oct 2021 08:11:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4161960EBD; Mon, 25 Oct 2021 12:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635163774; bh=oA1rXK3mOZ0tq5cb2BaPVapIai6qb8HrBsRqLCGUxlg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NBk+U5/SOIahD3GkaV0dISWBx/2Syk/e09s5gG3p1U9wH+3wW+LWgQVUx/tr4D6RH GRVThmDYtQZVebfeG3ufFVRlTQLDfX5/239ztq8pq3rwZyzCEmJt9Joo1dWtHqqMGg wwpADX7MXIWeMRWAa2BNzfTCw3xBd0tQ87brJxSgCcoTEHYB0lqzpk6mNVjT4nl5qU FQR18xVBmDJEp/c2QFcDUcYPOJVBCyY0pusO5zlVEG12u6D81XgflesTRPr2I9kJLC X1FhKyjHpYq2pc9U0DMvhwEO0tSRT6K4N3DyC9oRgiaMbK7q5HpUqbBeUY0fYi8ull DH1PbqMHRNRCw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1meymz-0001f9-5E; Mon, 25 Oct 2021 14:09:17 +0200 From: Johan Hovold To: Greg Kroah-Hartman Cc: Larry Finger , Florian Schilhabel , linux-staging@lists.linux.dev, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/2] staging: r8712u: fix control-message timeout Date: Mon, 25 Oct 2021 14:09:10 +0200 Message-Id: <20211025120910.6339-3-johan@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211025120910.6339-1-johan@kernel.org> References: <20211025120910.6339-1-johan@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: 2865d42c78a9 ("staging: r8712u: Add the new driver to the mainline kernel") Cc: stable@vger.kernel.org # 2.6.37 Signed-off-by: Johan Hovold --- drivers/staging/rtl8712/usb_ops_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c index 655497cead12..f984a5ab2c6f 100644 --- a/drivers/staging/rtl8712/usb_ops_linux.c +++ b/drivers/staging/rtl8712/usb_ops_linux.c @@ -494,7 +494,7 @@ int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value, memcpy(pIo_buf, pdata, len); } status = usb_control_msg(udev, pipe, request, reqtype, value, index, - pIo_buf, len, HZ / 2); + pIo_buf, len, 500); if (status > 0) { /* Success this control transfer. */ if (requesttype == 0x01) { /* For Control read transfer, we have to copy the read -- 2.32.0