USB: Fix connected device switch to Inactive state.

[pandora-kernel.git] / drivers / usb / core / hub.c

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index d1fceb2..b00f109 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2605,7 +2605,6 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
        case -ENODEV:
                clear_port_feature(hub->hdev,
                                port1, USB_PORT_FEAT_C_RESET);
-               /* FIXME need disconnect() for NOTATTACHED device */
                if (hub_is_superspeed(hub->hdev)) {
                        clear_port_feature(hub->hdev, port1,
                                        USB_PORT_FEAT_C_BH_PORT_RESET);
@@ -2639,6 +2638,18 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
                 * Some companion controllers don't like it when they mix.
                 */
                down_read(&ehci_cf_port_reset_rwsem);
+       } else if (!warm) {
+               /*
+                * If the caller hasn't explicitly requested a warm reset,
+                * double check and see if one is needed.
+                */
+               status = hub_port_status(hub, port1,
+                                       &portstatus, &portchange);
+               if (status < 0)
+                       goto done;
+
+               if (hub_port_warm_reset_required(hub, portstatus))
+                       warm = true;
        }
 
        /* Reset the port */
@@ -4690,12 +4701,21 @@ static void hub_events(void)
                         */
                        if (hub_port_warm_reset_required(hub, portstatus)) {
                                int status;
+                               struct usb_device *udev =
+                                       hub->ports[i - 1]->child;
 
                                dev_dbg(hub_dev, "warm reset port %d\n", i);
-                               status = hub_port_reset(hub, i, NULL,
-                                               HUB_BH_RESET_TIME, true);
-                               if (status < 0)
-                                       hub_port_disable(hub, i, 1);
+                               if (!udev) {
+                                       status = hub_port_reset(hub, i,
+                                                       NULL, HUB_BH_RESET_TIME,
+                                                       true);
+                                       if (status < 0)
+                                               hub_port_disable(hub, i, 1);
+                               } else {
+                                       usb_lock_device(udev);
+                                       status = usb_reset_device(udev);
+                                       usb_unlock_device(udev);
+                               }
                                connect_change = 0;
                        }