From patchwork Mon Oct 25 11:53:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 12581599 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 C5993C433FE for ; Mon, 25 Oct 2021 11:54:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 921106105A for ; Mon, 25 Oct 2021 11:54:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 921106105A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A5B8C89CB3; Mon, 25 Oct 2021 11:54:18 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7BF8189CB3 for ; Mon, 25 Oct 2021 11:54:17 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 4FD3061027; Mon, 25 Oct 2021 11:54:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635162857; bh=YDaGvnW29RXV7XM/rAbNb6WCpfjPhf7k8y9aqrr8FiM=; h=From:To:Cc:Subject:Date:From; b=RVsl9hLtMhXwTB5Mw48Oz5jmVRapGBXa4svqWsgHdhLc5qAkqTNPa/rgL8FoDzyPq Hzy03LLoGSJgrZqTavKUSDKMEdZI+p20FjPdncI3N7NGTDcvzpMf8azCwxSxEZ71XX 3Qtc4Ibj0XQ8XBifTBXdZllXNLCMzw2Sooe07jMilpDu3tvh58wlDt6s8Xg5ijrcHO 95vXeqZzvICffg1vP6gltPzbKJteIbgt1k7FCwMsnzrsZZxh6N3uOE4/voKrE53ipy O6BMe1Tdhdx6aHr7Bhj1tFa7llt9TyUUgY0VAD1TdWTKFqU+AYvd28QMuO5hMihxYl Fq2KfmMtZ3K/g== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1meyYB-0001Kr-Qz; Mon, 25 Oct 2021 13:53:59 +0200 From: Johan Hovold To: Dave Airlie Cc: Sean Paul , Thomas Zimmermann , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH] drm/udl: fix control-message timeout Date: Mon, 25 Oct 2021 13:53:53 +0200 Message-Id: <20211025115353.5089-1-johan@kernel.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: 5320918b9a87 ("drm/udl: initial UDL driver (v4)") Cc: stable@vger.kernel.org # 3.4 Signed-off-by: Johan Hovold --- drivers/gpu/drm/udl/udl_connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index 3750fd216131..930574ad2bca 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c @@ -30,7 +30,7 @@ static int udl_get_edid_block(void *data, u8 *buf, unsigned int block, int bval = (i + block * EDID_LENGTH) << 8; ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x02, (0x80 | (0x02 << 5)), bval, - 0xA1, read_buff, 2, HZ); + 0xA1, read_buff, 2, 1000); if (ret < 1) { DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret); kfree(read_buff);