Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3545479pxb; Mon, 24 Jan 2022 11:54:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZdZblyaGRpm/ZL9QXfo3BMP28DYUxzMBWuNtAJYhH5CFA19LinORGTG/A5D7Zwi13XNZ2 X-Received: by 2002:a17:902:c102:b0:14b:7fc:2660 with SMTP id 2-20020a170902c10200b0014b07fc2660mr15403423pli.92.1643054056202; Mon, 24 Jan 2022 11:54:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643054056; cv=none; d=google.com; s=arc-20160816; b=ol5AlTUZ/qsWCiDj9SB3sQw4ZwvMY6N+rig0hG/lBL5+8oB4NOs1S43+o7yy+WXWwY 1awK+Vh05Rc5vui5g6JlCB5nD9PbAAH8+b7+hx64bk1M2QjmWRy2LyyWGcGKCSVZLifz 92YoaoTjfYX+AWSrjGUwlIfCpgsdmColzzx+vk/4K1H+BKAGZE9KFDw05C6C7fJw8ajL lwswSxN1sZsGVBDN3DQO+w0HgerkHnutUOxBbcqcOYVTxdEjvhTBuOnBtxaV4YDKVbP7 0oRMjqUXCOcoWo2TCT1QUEmS+KUqzDcSFcCkqFA9OycJ+GmnYgdcoc+SXpbhPwF76V7z XNyg== 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=+c8D79PcvTa+92fwgI9PWv5mcV29NqIZS3cp1/NbeNM=; b=a1sguU4YdHZHBjTepopEauyCW2n61ZqG2wVVGtMx6Wtp7wBiwisixvFCj9dCon44Ht tN46kL1dUNC+Hwafwga33B3yY5cYuwn2VtNpYi9tiod3cCwwQ5eEEoBuPLjy4i3YoPuv kIK1LQ798aBPuIDtQBtN/mwWczNE+Q5uffMp7mqWftrFpapIpkNel6vg9qnnvTBe0/lv bKbxNtQQdt+iHCTtZTRljvxjhFKqasyCp9qWrSjVP8x2/eNqACFIdXwvvOyIz6A3jUxW 8JcoQvfWvFRATmR6Rj+CKuAJ5ISZ/oYZxsTCN6LP1hi6qhTb2dJ560yBHp+o8pc+kZnD NiWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FWLuMSo+; 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 y8si10240151pfq.133.2022.01.24.11.54.03; Mon, 24 Jan 2022 11:54:16 -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=FWLuMSo+; 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 S241968AbiAXStV (ORCPT + 99 others); Mon, 24 Jan 2022 13:49:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245332AbiAXSsz (ORCPT ); Mon, 24 Jan 2022 13:48:55 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAE8CC06173D; Mon, 24 Jan 2022 10:48:54 -0800 (PST) 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 83352B8121A; Mon, 24 Jan 2022 18:48:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C8F7C340E5; Mon, 24 Jan 2022 18:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643050132; bh=LTmjrOQuGbGFxf9tbR9lV6bPJ6MV/ExjurJHeVNmXqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FWLuMSo+fFKMtT1PByX8SANHrm0i4oPmU9E35J34TzafE1laDUQ8qeC+6uimVEQqo 4MR1P20vMJGbwrlKiG3g19h42u0gDK28BfluKwhIM1KAD3mwc08zx8Zm36y4w9okBI D1nZ5eQBVzDW2TdXj80McgpvgJnpsQinJY7tRYCE= 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 4.4 013/114] media: mceusb: fix control-message timeouts Date: Mon, 24 Jan 2022 19:41:48 +0100 Message-Id: <20220124183927.523864117@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124183927.095545464@linuxfoundation.org> References: <20220124183927.095545464@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 @@ -1118,7 +1118,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]); @@ -1126,20 +1126,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 */