USB: add USB-Persist facility

[deliverable/linux.git] / drivers / usb / core / generic.c

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 7cbf992adccd4033aaa066cd34208a17454d314e..d363b0ea73459884162f419fadeb2738d19ef8f2 100644 (file)
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -217,7 +217,10 @@ static int generic_resume(struct usb_device *udev)
 {
        int rc;
 
-       rc = usb_port_resume(udev);
+       if (udev->reset_resume)
+               rc = usb_reset_suspended_device(udev);
+       else
+               rc = usb_port_resume(udev);
 
        /* Root hubs don't have upstream ports to resume or reset,
         * so the line above won't do much for them.  We have to