Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3614551pxv; Mon, 5 Jul 2021 01:23:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZIwNvCw59/gFImAThHqKeWhYURHT1/liK4t26j6PEx1+wThkQujps+twScgGhWGa1MlTm X-Received: by 2002:a05:6402:101a:: with SMTP id c26mr14858017edu.317.1625473386974; Mon, 05 Jul 2021 01:23:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473386; cv=none; d=google.com; s=arc-20160816; b=HBX/WFunNsvOhmlG1dkrYhNoQWY72IxOBcBKsV2g+DypdZuKckKaf7oS7ALGAqMc19 SI7kT2OzDjEj6zC2N/tdYvBdxuSnno2TCJQfVnfq8K3Zqx6bhjeNvOtNxOHZhueAx/DH fp6J5D8mn7OQwdDbJUxWcyswnLpGZKhwYxPDbZdPwmtfF7bMwWY9lCXwYNblhYqWDB3+ I8v0ndeLlwDfUsQg6pEGDPGn4bfHVMT47/UHN9B07XQ6VXF/mJOM/4VKVHIRNvnTXlGx RyEyoZ8W4H6lAMg/vBoa4sLYol4yx90CSQdUiRUGZROxx8/5wQInIcqaF30VMfrdfCOZ Yvhg== 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=X0Ed4IIz4GzciBkycmXBW/uJRzyRSslxxWpKoxLOiLo=; b=jLNZs9SCP1nl+sps2uGXYY0hTkvr43f8zsZrucsP6Ct3qn0nGirA1RABt4s9WlkRiY Xi5gPneX4AutT5upsEab4oHEqlI+tTHtn27w15Q8Il7G8+zmEzKYonIE4CN8EZcMETzG J9G5cLMuHhDsePqb/wnx4Lxosisv6pmTZlinATBp9Vui0gyrdXUItlonYxJ7F1Vq+xL4 +lTvtgVQSNEBUgcqL68cUhOBOWJ2NQCpsW10/ye1eA+d+gxNBPSHYwsmnTrrEvdwomzL 8QDScm8oPNLMrQqbVQzQzHs+VOJVXYeAFYdiieSFe6DkiYFtJnT3DbPJPVncTbmLNhgW 0O6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NTlgWc39; 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 h24si12242231ejt.474.2021.07.05.01.22.44; Mon, 05 Jul 2021 01:23:06 -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=NTlgWc39; 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 S230371AbhGEIXb (ORCPT + 99 others); Mon, 5 Jul 2021 04:23:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:40940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230333AbhGEIXU (ORCPT ); Mon, 5 Jul 2021 04:23:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E009B6141C; Mon, 5 Jul 2021 08:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625473240; bh=s65G1mh9EOwBbfyl45BNCxFhJTfkQYqTSqxwr7Uqpio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NTlgWc39cXODirNmd2mHbb849K4kdnGt/MQwDXdQnqpbWhBnQMU+9YrN7r+FMfoX0 /luC4Nivp/vuALhOVKLFsykd49TzeoCGRLIsgX48ZSSy9/kSd/iO7qTRpuMQCF3Qqu 4FWXhdU3H5ZJaKtc7krezSJTV1x+o3fieyGNdDlLs5zuzNKHfhr9hRCX/x2061WLpV QIigUbTXEtuyupx17OECDVmljEUlCsRq2wn5TZJhYY8C0UiqWeOjsSCm92qVFL2JNe VpOq7cXkJ2BHFU5QGn0N06FkBO8d6PoedvFhg45R5q5Qm+GmQAuVOcNKdkFvP2q185 2/ngEGROpL9Lw== Received: from johan by xi with local (Exim 4.94.2) (envelope-from ) id 1m0JqF-0004lu-9r; Mon, 05 Jul 2021 10:20:35 +0200 From: Johan Hovold To: Johan Hovold Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] USB: serial: cp210x: clean up control-request timeout Date: Mon, 5 Jul 2021 10:20:12 +0200 Message-Id: <20210705082015.18286-4-johan@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210705082015.18286-1-johan@kernel.org> References: <20210705082015.18286-1-johan@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For consistency use the USB_CTRL_GET_TIMEOUT define for the read-register request timeout (same value as USB_CTRL_SET_TIMEOUT). Signed-off-by: Johan Hovold --- drivers/usb/serial/cp210x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index fd6bd574e2a5..e560608afb1e 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -637,7 +637,7 @@ static int cp210x_read_reg_block(struct usb_serial_port *port, u8 req, result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), req, REQTYPE_INTERFACE_TO_HOST, 0, port_priv->bInterfaceNumber, dmabuf, bufsize, - USB_CTRL_SET_TIMEOUT); + USB_CTRL_GET_TIMEOUT); if (result == bufsize) { memcpy(buf, dmabuf, bufsize); result = 0; -- 2.31.1