diff options
author | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-09-28 06:26:18 -0400 |
---|---|---|
committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-11-03 04:38:12 -0400 |
commit | a98e25e71d115702d79ef0f4f8009ce5d4cf37eb (patch) | |
tree | bfb4e66cb3296c303be75c3fa2e933689ff041f8 /drivers/usb/chipidea/udc.c | |
parent | 08295ee0e6976b060cd5c2a59877d8ea6379075c (diff) |
usb: chipidea: udc: make use of new usb_endpoint_maxp_mult()
We have introduced a helper to calculate multiplier
value from wMaxPacketSize. Start using it.
Acked-by: Peter Chen <Peter.Chen@nxp.com>
Cc: <linux-usb@vger.kernel.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/chipidea/udc.c')
-rw-r--r-- | drivers/usb/chipidea/udc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index 661f43fe0f9e..7a535be3024e 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c | |||
@@ -821,7 +821,7 @@ static int _ep_queue(struct usb_ep *ep, struct usb_request *req, | |||
821 | } | 821 | } |
822 | 822 | ||
823 | if (usb_endpoint_xfer_isoc(hwep->ep.desc) && | 823 | if (usb_endpoint_xfer_isoc(hwep->ep.desc) && |
824 | hwreq->req.length > (1 + hwep->ep.mult) * hwep->ep.maxpacket) { | 824 | hwreq->req.length > hwep->ep.mult * hwep->ep.maxpacket) { |
825 | dev_err(hwep->ci->dev, "request length too big for isochronous\n"); | 825 | dev_err(hwep->ci->dev, "request length too big for isochronous\n"); |
826 | return -EMSGSIZE; | 826 | return -EMSGSIZE; |
827 | } | 827 | } |
@@ -1254,7 +1254,7 @@ static int ep_enable(struct usb_ep *ep, | |||
1254 | hwep->type = usb_endpoint_type(desc); | 1254 | hwep->type = usb_endpoint_type(desc); |
1255 | 1255 | ||
1256 | hwep->ep.maxpacket = usb_endpoint_maxp(desc) & 0x07ff; | 1256 | hwep->ep.maxpacket = usb_endpoint_maxp(desc) & 0x07ff; |
1257 | hwep->ep.mult = QH_ISO_MULT(usb_endpoint_maxp(desc)); | 1257 | hwep->ep.mult = usb_endpoint_maxp_mult(desc); |
1258 | 1258 | ||
1259 | if (hwep->type == USB_ENDPOINT_XFER_CONTROL) | 1259 | if (hwep->type == USB_ENDPOINT_XFER_CONTROL) |
1260 | cap |= QH_IOS; | 1260 | cap |= QH_IOS; |