diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-08-23 06:12:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 12:47:40 -0400 |
commit | 29cc88979a8818cd8c5019426e945aed118b400e (patch) | |
tree | 849401ad869d09ce45dd7a3fadd7eb71b1e9fcbd /drivers/usb/gadget/omap_udc.c | |
parent | 46a57283e86c68351377ac3349f1465aee938fbd (diff) |
USB: use usb_endpoint_maxp() instead of le16_to_cpu()
Now ${LINUX}/drivers/usb/* can use usb_endpoint_maxp(desc) to get maximum packet size
instead of le16_to_cpu(desc->wMaxPacketSize).
This patch fix it up
Cc: Armin Fuerst <fuerst@in.tum.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Johannes Erdfelt <johannes@erdfelt.com>
Cc: Vojtech Pavlik <vojtech@suse.cz>
Cc: Oliver Neukum <oliver@neukum.name>
Cc: David Kubicek <dave@awk.cz>
Cc: Johan Hovold <jhovold@gmail.com>
Cc: Brad Hards <bhards@bigpond.net.au>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Thomas Dahlmann <dahlmann.thomas@arcor.de>
Cc: David Brownell <david-b@pacbell.net>
Cc: David Lopo <dlopo@chipidea.mips.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Michal Nazarewicz <m.nazarewicz@samsung.com>
Cc: Xie Xiaobo <X.Xie@freescale.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Jiang Bo <tanya.jiang@freescale.com>
Cc: Yuan-hsin Chen <yhchen@faraday-tech.com>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Xiaochen Shen <xiaochen.shen@intel.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: OKI SEMICONDUCTOR, <toshiharu-linux@dsn.okisemi.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Ben Dooks <ben@simtec.co.uk>
Cc: Thomas Abraham <thomas.ab@samsung.com>
Cc: Herbert Pƶtzl <herbert@13thfloor.at>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Roman Weissgaerber <weissg@vienna.at>
Acked-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Tony Olech <tony.olech@elandigitalsystems.com>
Cc: Florian Floe Echtler <echtler@fs.tum.de>
Cc: Christian Lucht <lucht@codemercs.com>
Cc: Juergen Stuber <starblue@sourceforge.net>
Cc: Georges Toth <g.toth@e-biz.lu>
Cc: Bill Ryder <bryder@sgi.com>
Cc: Kuba Ober <kuba@mareimbrium.org>
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/omap_udc.c')
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 740c7daed279..b7a7799ddd4f 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -166,15 +166,14 @@ static int omap_ep_enable(struct usb_ep *_ep, | |||
166 | if (!_ep || !desc || ep->desc | 166 | if (!_ep || !desc || ep->desc |
167 | || desc->bDescriptorType != USB_DT_ENDPOINT | 167 | || desc->bDescriptorType != USB_DT_ENDPOINT |
168 | || ep->bEndpointAddress != desc->bEndpointAddress | 168 | || ep->bEndpointAddress != desc->bEndpointAddress |
169 | || ep->maxpacket < le16_to_cpu | 169 | || ep->maxpacket < usb_endpoint_maxp(desc)) { |
170 | (desc->wMaxPacketSize)) { | ||
171 | DBG("%s, bad ep or descriptor\n", __func__); | 170 | DBG("%s, bad ep or descriptor\n", __func__); |
172 | return -EINVAL; | 171 | return -EINVAL; |
173 | } | 172 | } |
174 | maxp = le16_to_cpu (desc->wMaxPacketSize); | 173 | maxp = usb_endpoint_maxp(desc); |
175 | if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK | 174 | if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK |
176 | && maxp != ep->maxpacket) | 175 | && maxp != ep->maxpacket) |
177 | || le16_to_cpu(desc->wMaxPacketSize) > ep->maxpacket | 176 | || usb_endpoint_maxp(desc) > ep->maxpacket |
178 | || !desc->wMaxPacketSize) { | 177 | || !desc->wMaxPacketSize) { |
179 | DBG("%s, bad %s maxpacket\n", __func__, _ep->name); | 178 | DBG("%s, bad %s maxpacket\n", __func__, _ep->name); |
180 | return -ERANGE; | 179 | return -ERANGE; |