1 files changed, 19 insertions, 8 deletions

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 740835bb8575..218f9660d7ee 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -236,10 +236,8 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
                 temp = ehci_readl(ehci, &ehci->regs->port_status [i]);
                 temp &= ~(PORT_RWC_BITS | PORT_WAKE_BITS);
                 if (test_bit(i, &ehci->bus_suspended) &&
-                                (temp & PORT_SUSPEND)) {
-                        ehci->reset_done [i] = jiffies + msecs_to_jiffies (20);
+                                (temp & PORT_SUSPEND))
                         temp |= PORT_RESUME;
-                }
                 ehci_writel(ehci, temp, &ehci->regs->port_status [i]);
         }
         i = HCS_N_PORTS (ehci->hcs_params);
@@ -482,10 +480,9 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
                  * controller by the user.
                  */
 
-                if ((temp & mask) != 0
-                                || ((temp & PORT_RESUME) != 0
-                                        && time_after_eq(jiffies,
-                                                ehci->reset_done[i]))) {
+                if ((temp & mask) != 0 || test_bit(i, &ehci->port_c_suspend)
+                                || (ehci->reset_done[i] && time_after_eq(
+                                        jiffies, ehci->reset_done[i]))) {
                         if (i < 7)
                             buf [0] |= 1 << (i + 1);
                         else
@@ -688,6 +685,7 @@ static int ehci_hub_control (
                         /* resume completed? */
                         else if (time_after_eq(jiffies,
                                         ehci->reset_done[wIndex])) {
+                                clear_bit(wIndex, &ehci->suspended_ports);
                                 set_bit(wIndex, &ehci->port_c_suspend);
                                 ehci->reset_done[wIndex] = 0;
 
@@ -734,6 +732,9 @@ static int ehci_hub_control (
                                         ehci_readl(ehci, status_reg));
                 }
 
+                if (!(temp & (PORT_RESUME|PORT_RESET)))
+                        ehci->reset_done[wIndex] = 0;
+
                 /* transfer dedicated ports to the companion hc */
                 if ((temp & PORT_CONNECT) &&
                                 test_bit(wIndex, &ehci->companion_ports)) {
@@ -757,8 +758,17 @@ static int ehci_hub_control (
                 }
                 if (temp & PORT_PE)
                         status |= 1 << USB_PORT_FEAT_ENABLE;
-                if (temp & (PORT_SUSPEND|PORT_RESUME))
+
+                /* maybe the port was unsuspended without our knowledge */
+                if (temp & (PORT_SUSPEND|PORT_RESUME)) {
                         status |= 1 << USB_PORT_FEAT_SUSPEND;
+                } else if (test_bit(wIndex, &ehci->suspended_ports)) {
+                        clear_bit(wIndex, &ehci->suspended_ports);
+                        ehci->reset_done[wIndex] = 0;
+                        if (temp & PORT_PE)
+                                set_bit(wIndex, &ehci->port_c_suspend);
+                }
+
                 if (temp & PORT_OC)
                         status |= 1 << USB_PORT_FEAT_OVER_CURRENT;
                 if (temp & PORT_RESET)
@@ -803,6 +813,7 @@ static int ehci_hub_control (
                                         || (temp & PORT_RESET) != 0)
                                 goto error;
                         ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
+                        set_bit(wIndex, &ehci->suspended_ports);
                         break;
                 case USB_PORT_FEAT_POWER:
                         if (HCS_PPC (ehci->hcs_params))