diff mbox series

[5.4,29/34] usb: mtu3: fix interval value for intr and isoc

Message ID	20220110071816.656375417@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Chunfeng Yun <chunfeng.yun@mediatek.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 29/34] usb: mtu3: fix interval value for intr and isoc Date: Mon, 10 Jan 2022 08:23:24 +0100 Message-Id: <20220110071816.656375417@linuxfoundation.org> In-Reply-To: <20220110071815.647309738@linuxfoundation.org> References: <20220110071815.647309738@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/34] Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc40 [5.4,03/34] selftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv() [5.4,07/34] iavf: Fix limit of total number of queues to active queues of VF [5.4,09/34] RDMA/uverbs: Check for null return of kmalloc_array [5.4,11/34] i40e: fix use-after-free in i40e_sync_filters_subtask() [5.4,12/34] i40e: Fix for displaying message regarding NVM version [5.4,13/34] i40e: Fix incorrect netdevs real number of RX/TX queues [5.4,14/34] ipv4: Check attribute length for RTA_GATEWAY in multipath route [5.4,16/34] ipv6: Check attribute length for RTA_GATEWAY in multipath route [5.4,20/34] sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc [5.4,22/34] xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate [5.4,23/34] power: supply: core: Break capacity loop [5.4,24/34] power: reset: ltc2952: Fix use of floating point literals [5.4,26/34] phonet: refcount leak in pep_sock_accep [5.4,27/34] ipv6: Continue processing multipath route even if gateway attribute is invalid [5.4,28/34] ipv6: Do cleanup if attribute validation fails in multipath route [5.4,29/34] usb: mtu3: fix interval value for intr and isoc [5.4,31/34] ip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate [5.4,33/34] atlantic: Fix buff_ring OOB in aq_ring_rx_clean

Commit Message

Greg KH Jan. 10, 2022, 7:23 a.m. UTC

From: Chunfeng Yun <chunfeng.yun@mediatek.com>

[ Upstream commit e3d4621c22f90c33321ae6a6baab60cdb8e5a77c ]

Use the Interval value from isoc/intr endpoint descriptor, no need
minus one. The original code doesn't cause transfer error for
normal cases, but it may have side effect with respond time of ERDY
or tPingTimeout.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/20211218095749.6250-1-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/usb/mtu3/mtu3_gadget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
index 253c8b71d3c49..061da9b82b967 100644
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -85,7 +85,7 @@  static int mtu3_ep_enable(struct mtu3_ep *mep)
 		if (usb_endpoint_xfer_int(desc) ||
 				usb_endpoint_xfer_isoc(desc)) {
 			interval = desc->bInterval;
-			interval = clamp_val(interval, 1, 16) - 1;
+			interval = clamp_val(interval, 1, 16);
 			if (usb_endpoint_xfer_isoc(desc) && comp_desc)
 				mult = comp_desc->bmAttributes;
 		}
@@ -97,7 +97,7 @@  static int mtu3_ep_enable(struct mtu3_ep *mep)
 		if (usb_endpoint_xfer_isoc(desc) ||
 				usb_endpoint_xfer_int(desc)) {
 			interval = desc->bInterval;
-			interval = clamp_val(interval, 1, 16) - 1;
+			interval = clamp_val(interval, 1, 16);
 			mult = usb_endpoint_maxp_mult(desc) - 1;
 		}
 		break;