diff --git a/[refs] b/[refs] index b8b02a188588..4a43cc47851d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a8e87b23ff4a979bde5451a242466a4b3f9fe7d +refs/heads/master: 43c5d5aaafef56618a6efbcab7f91615da1a8659 diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index f1d64d4bbf5f..7dd28f8e1cea 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -1892,8 +1892,8 @@ int usb_resume_device(struct usb_device *udev) status = hub_port_resume(hdev_to_hub(udev->parent), udev->portnum, udev); } else - status = 0; #endif + status = 0; } else status = finish_device_resume(udev); if (status < 0)