From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0113DC433FE for ; Wed, 10 Nov 2021 18:56:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB63161052 for ; Wed, 10 Nov 2021 18:56:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233311AbhKJS65 (ORCPT ); Wed, 10 Nov 2021 13:58:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:54180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233497AbhKJS43 (ORCPT ); Wed, 10 Nov 2021 13:56:29 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A8CD861A09; Wed, 10 Nov 2021 18:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636570189; bh=u3r0Z/Juz08h7mxzl8vGp2X6mRKE+bAUTzREhiY4tUE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1gFz6F9F2ymqOz4X+aYIVzNLnco58TCzE2Wmq2BhP8h3UxadO4RKlD4jUzehInmJk jZxpyVCZKnNLZAE9hGaEsHmZeKAYqPT4Bq1acEBUbIEUa7mEkML4RoOaNq1lgVJw8A nzUxMKHeS3shBcAgXhnTrYlUTv6aEJnr1IBWP7ao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Larry Finger , Johan Hovold Subject: [PATCH 5.14 21/24] staging: r8712u: fix control-message timeout Date: Wed, 10 Nov 2021 19:44:13 +0100 Message-Id: <20211110182004.009659352@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211110182003.342919058@linuxfoundation.org> References: <20211110182003.342919058@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 ce4940525f36ffdcf4fa623bcedab9c2a6db893a upstream. 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 Acked-by: Larry Finger Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20211025120910.6339-3-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/usb_ops_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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_ 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