Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3579330pxb; Mon, 24 Jan 2022 12:41:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZGOXRd4/qtDzeWEPu5of0mA0Ixz74K2SiGV6AJVZoKe+vVNOv9jyOK09yxz/LN2hYaxFR X-Received: by 2002:a63:1c1d:: with SMTP id c29mr13112974pgc.89.1643056911856; Mon, 24 Jan 2022 12:41:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056911; cv=none; d=google.com; s=arc-20160816; b=bM0JgESb/+kJvYxPc/c74eLyQGSubZGsH99tiSYMSMam+pvXCrbXkBz0acGfLDMNFt YsrHcuAMjJEyM0aG9kKJ/+KuXnGo/5I89VRQ4wg3zRCXGPRYvS/vDXIpqzeVBNbQ1d1L yi/uepaMxeC47p0I6vyb7C+71yyBlc3YfE1JZTryxdJJUx08i3OWIe6h2MIgZ8Nul+mC +annA9+Sou4pFI7tKtvaQh7+94a61Fn7PH/2gSWOTrhW88CIPHcdL0acbdrUelhR70RX qy5FXlqlMnT5E0LVwldJ/BlJYgE4pB0M/VIVYwhChFRdEgXfSous3QhCNfJGDNpl2bYZ jdTg== 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=krnlqE5A1vE3hN2YNq75mDt44ga8+RtAzrz/+s6S03I=; b=JyFqE0Cm+Uq9/gAxAQYxzC7C6oNPv6s3j4jF0y3alqnslLO3PBMH0oInIZwMPGp4je Cc0SHnzYhmwtD9UoHYT7s8eA7xJFbyEE5+Emdsm9TytSQeQWSE+N0Un9s3bsKPlt9nKV 96nXz/R/GbooZ7GM6ZL03F4TjjCmhh5pc7zXQr7OzK3AuQzAngSVtDVW+U+Dl+L0pRZH 2Z22S4vDVVgQ/HkoDJEUOWA6Jzpcveo1SLVzxEjBRFsULt0cCUXU5JYbUX2ghfOkcxRB Mwc9++DPHfEiNiTYqoqZK+7Zi2PWblgS6yuXiw87KcJ3izcm12nG8fZtX+Ho61yVMOBF cymw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v9Y9JW1p; 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 n68si13567714pfd.246.2022.01.24.12.41.37; Mon, 24 Jan 2022 12:41:51 -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=v9Y9JW1p; 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 S1353019AbiAXT6R (ORCPT + 99 others); Mon, 24 Jan 2022 14:58:17 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:48502 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350674AbiAXTZJ (ORCPT ); Mon, 24 Jan 2022 14:25:09 -0500 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 ams.source.kernel.org (Postfix) with ESMTPS id 1CB6DB811F9; Mon, 24 Jan 2022 19:25:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 265D2C340E7; Mon, 24 Jan 2022 19:25:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643052306; bh=oj5Je4hEdh8UvrPiv7Hw9okiM1qi3n2AsOBeJ6hgeSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v9Y9JW1phfWJMtHFi7M55aKgq6RbsRVIyuFB3huAAzvBXXLSJVgJgnnKnM2tP7E14 w0eNRCdMSDVilEyF64rVNgttieiBH2Id6MQNYHojcQp3JhYFEMf5/M3o6HXduak6r8 C2Ja86kCIHcxb5gwyrVdJmHPcNZyQrk/MPKkPZsw= 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 016/320] media: mceusb: fix control-message timeouts Date: Mon, 24 Jan 2022 19:40:00 +0100 Message-Id: <20220124183954.304831826@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 16394e998cbb050730536bdf7e89f5a70efbd974 upstream. USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: 66e89522aff7 ("V4L/DVB: IR: add mceusb IR receiver driver") Cc: stable@vger.kernel.org # 2.6.36 Signed-off-by: Johan Hovold Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/rc/mceusb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c @@ -1430,7 +1430,7 @@ static void mceusb_gen1_init(struct mceu */ ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0), USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0, - data, USB_CTRL_MSG_SZ, HZ * 3); + data, USB_CTRL_MSG_SZ, 3000); dev_dbg(dev, "set address - ret = %d", ret); dev_dbg(dev, "set address - data[0] = %d, data[1] = %d", data[0], data[1]); @@ -1438,20 +1438,20 @@ static void mceusb_gen1_init(struct mceu /* set feature: bit rate 38400 bps */ ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), USB_REQ_SET_FEATURE, USB_TYPE_VENDOR, - 0xc04e, 0x0000, NULL, 0, HZ * 3); + 0xc04e, 0x0000, NULL, 0, 3000); dev_dbg(dev, "set feature - ret = %d", ret); /* bRequest 4: set char length to 8 bits */ ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), 4, USB_TYPE_VENDOR, - 0x0808, 0x0000, NULL, 0, HZ * 3); + 0x0808, 0x0000, NULL, 0, 3000); dev_dbg(dev, "set char length - retB = %d", ret); /* bRequest 2: set handshaking to use DTR/DSR */ ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), 2, USB_TYPE_VENDOR, - 0x0000, 0x0100, NULL, 0, HZ * 3); + 0x0000, 0x0100, NULL, 0, 3000); dev_dbg(dev, "set handshake - retC = %d", ret); /* device resume */