Merge branch 'uboot'

[karo-tx-uboot.git] / drivers / usb / gadget / ep0.c

diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c
index b3214882f76b5ad0c03f62a482fe7f7149661d91..4ba2f3d99fd67861bc1d9fee5bba71b69315d3d0 100644 (file)
--- 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);