diff options
| -rw-r--r-- | drivers/usb/core/usb.c | 4 | ||||
| -rw-r--r-- | include/usb/usb.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index d1c3e0394d..9073fff4be 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -663,7 +663,7 @@ int usb_clear_halt(struct usb_device *dev, int pipe) result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT, 0, - endp, NULL, 0, USB_CNTL_TIMEOUT * 3); + endp, NULL, 0, USB_CNTL_TIMEOUT); /* don't clear if failed */ if (result < 0) @@ -748,7 +748,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE, alternate, interface, NULL, 0, - USB_CNTL_TIMEOUT * 5); + USB_CNTL_TIMEOUT); if (ret < 0) return ret; diff --git a/include/usb/usb.h b/include/usb/usb.h index 991f3d7dd1..8f3ce2aeff 100644 --- a/include/usb/usb.h +++ b/include/usb/usb.h @@ -39,7 +39,7 @@ #define USB_MAXCHILDREN 8 /* This is arbitrary */ #define USB_MAX_HUB 16 -#define USB_CNTL_TIMEOUT 100 /* 100ms timeout */ +#define USB_CNTL_TIMEOUT 5000 /* 5000ms timeout */ /* device request (setup) */ struct devrequest { |