Merge branch 'master' of git://git.denx.de/u-boot-usb

[karo-tx-uboot.git] / drivers / usb / host / ehci-hcd.c

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 54e948aa31eec26582af8febc6ef638946b42797..bc7606646bbcf9ac76ab679a8f85405ceaa6d45a 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -910,7 +910,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
        }
 
        mdelay(1);
        }
 
        mdelay(1);

-       len = min3(srclen, le16_to_cpu(req->length), length);
+       len = min3(srclen, (int)le16_to_cpu(req->length), length);

        if (srcptr != NULL && len > 0)
                memcpy(buffer, srcptr, len);
        else
        if (srcptr != NULL && len > 0)
                memcpy(buffer, srcptr, len);
        else