[PATCH] USB: Don't assume root-hub resume succeeds

This patch (as614) makes a small change to the part of the hub driver
responsible for remote wakeup of root hubs.  When these wakeups occur
the driver is suspended, and in case the resume fails the driver should
remain suspended -- it shouldn't try to proceed with its normal
processing.

This will hardly ever matter in normal use, but it did crop up while I
was debugging a different problem.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index a523c8f20b5d02e8a6a6e32cfe5d2e04cabe5ea3..650d5ee5871b2f1e6c3f8d7f628c11cd91bed2b1 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2697,6 +2697,8 @@ static void hub_events(void)
                if (i) {
                        dpm_runtime_resume(&hdev->dev);
                        dpm_runtime_resume(&intf->dev);
+                       usb_put_intf(intf);
+                       continue;
                }
 
                /* Lock the device, then check to see if we were