Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6] / drivers / usb / core / generic.c

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 4cbe7b3395130f386ff54deed3a9362eaff41d67..b2fc2b115256633a2f19bfd2a013ffaffedcaf28 100644 (file)
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -219,8 +219,6 @@ static int generic_resume(struct usb_device *udev)
         */
        if (!udev->parent)
                rc = hcd_bus_resume(udev);
-       else if (udev->reset_resume)
-               rc = usb_reset_suspended_device(udev);
        else
                rc = usb_port_resume(udev);
        return rc;