Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / drivers / usb / musb-new / musb_uboot.c

diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 762cbc11df10b3fc1c3cad722dbf958b96a836f1..c2400328a365ebe8c2d269743368db1ac64f4c71 100644 (file)
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -1,4 +1,5 @@
 #include <common.h>
+#include <watchdog.h>
 #include <asm/errno.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -164,6 +165,7 @@ static struct musb *gadget;
 
 int usb_gadget_handle_interrupts(void)
 {
+       WATCHDOG_RESET();
        if (!gadget || !gadget->isr)
                return -EINVAL;
 
@@ -174,7 +176,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 {
        int ret;
 
-       if (!driver || driver->speed < USB_SPEED_HIGH || !driver->bind ||
+       if (!driver || driver->speed < USB_SPEED_FULL || !driver->bind ||
            !driver->setup) {
                printf("bad parameter.\n");
                return -EINVAL;