usb: cdnsp: fix the wrong mult value for HS isoc or intr

commit e9ab75f26eb9354dfc03aea3401b8cfb42cd6718 upstream.

usb_endpoint_maxp() only returns the bit[10:0] of wMaxPacketSize
of endpoint descriptor, not include bit[12:11] anymore, so use
usb_endpoint_maxp_mult() instead.

Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")
Cc: stable@vger.kernel.org
Acked-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1628836253-7432-4-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/cdns3/cdnsp-mem.c b/drivers/usb/cdns3/cdnsp-mem.c
index a47948a1623fd49ee8fe7c612d80053f6b45571c..ad9aee3f1e3982b1c07023772c088b3c394e07df 100644 (file)
--- a/drivers/usb/cdns3/cdnsp-mem.c
+++ b/drivers/usb/cdns3/cdnsp-mem.c
@@ -882,7 +882,7 @@ static u32 cdnsp_get_endpoint_max_burst(struct usb_gadget *g,
        if (g->speed == USB_SPEED_HIGH &&
            (usb_endpoint_xfer_isoc(pep->endpoint.desc) ||
             usb_endpoint_xfer_int(pep->endpoint.desc)))
-               return (usb_endpoint_maxp(pep->endpoint.desc) & 0x1800) >> 11;
+               return usb_endpoint_maxp_mult(pep->endpoint.desc) - 1;
 
        return 0;
 }