projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-usb
[oweals/u-boot.git]
/
drivers
/
usb
/
gadget
/
pxa27x_udc.c
diff --git
a/drivers/usb/gadget/pxa27x_udc.c
b/drivers/usb/gadget/pxa27x_udc.c
index 05d1b566674d101125d3006b0bd741fe57070e06..efd5c7fda146177cb521dd819fcae332679a60bb 100644
(file)
--- a/
drivers/usb/gadget/pxa27x_udc.c
+++ b/
drivers/usb/gadget/pxa27x_udc.c
@@
-16,6
+16,7
@@
#include <asm/arch/hardware.h>
#include <asm/io.h>
#include <usb/pxa27x_udc.h>
#include <asm/arch/hardware.h>
#include <asm/io.h>
#include <usb/pxa27x_udc.h>
+#include <usb/udc.h>
#include "ep0.h"
#include "ep0.h"
@@
-64,7
+65,7
@@
static int udc_write_urb(struct usb_endpoint_instance *endpoint)
if (!urb || !urb->actual_length)
return -1;
if (!urb || !urb->actual_length)
return -1;
- n =
MIN
(urb->actual_length - endpoint->sent, endpoint->tx_packetSize);
+ n =
min
(urb->actual_length - endpoint->sent, endpoint->tx_packetSize);
if (n <= 0)
return -1;
if (n <= 0)
return -1;