summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/ep0.c
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2014-10-07 10:14:03 (GMT)
committerMinkyu Kang <mk7.kang@samsung.com>2014-10-07 10:14:03 (GMT)
commit3cc83f9d08a80fddf4c1e8e766eff8273f30814c (patch)
tree831246a1b77d26d0296a84c90684e0fee0368737 /drivers/usb/gadget/ep0.c
parent64f41212d880f3d00c6994d973aadeec5bda1b65 (diff)
parent6dd0e7c00bfa5ce861a72b8e4a3ef9e787306125 (diff)
downloadu-boot-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.xz
Merge branch 'uboot'
Diffstat (limited to 'drivers/usb/gadget/ep0.c')
-rw-r--r--drivers/usb/gadget/ep0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c
index b321488..4ba2f3d 100644
--- a/drivers/usb/gadget/ep0.c
+++ b/drivers/usb/gadget/ep0.c
@@ -315,7 +315,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device,
/*copy_config(urb, &report_descriptor->bData[0], report_descriptor->wLength, max); */
if (max - urb->actual_length > 0) {
int length =
- MIN (report_descriptor->wLength,
+ min(report_descriptor->wLength,
max - urb->actual_length);
memcpy (urb->buffer + urb->actual_length,
&report_descriptor->bData[0], length);