Merge 3.1-rc4 into usb-next

[pandora-kernel.git] / drivers / usb / musb / musb_gadget.c

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index e818203..3f79e7f 100644 (file)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1020,7 +1020,7 @@ static int musb_gadget_enable(struct usb_ep *ep,
                goto fail;
 
        /* REVISIT this rules out high bandwidth periodic transfers */
-       tmp = le16_to_cpu(desc->wMaxPacketSize);
+       tmp = usb_endpoint_maxp(desc);
        if (tmp & ~0x07ff) {
                int ok;