1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 7d06e77f6c4f..7b04ca96b585 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -464,7 +464,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
         while (i--) {
                 temp = ehci_readl(ehci, &ehci->regs->port_status [i]);
                 if (test_bit(i, &resume_needed)) {
-                        temp &= ~(PORT_RWC_BITS | PORT_RESUME);
+                        temp &= ~(PORT_RWC_BITS | PORT_SUSPEND | PORT_RESUME);
                         ehci_writel(ehci, temp, &ehci->regs->port_status [i]);
                         ehci_vdbg (ehci, "resumed port %d\n", i + 1);
                 }
@@ -590,7 +590,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
         u32             mask;
         int             ports, i, retval = 1;
         unsigned long   flags;
-        u32             ppcd = 0;
+        u32             ppcd = ~0;
 
         /* init status to no-changes */
         buf [0] = 0;
@@ -628,9 +628,10 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
 
         for (i = 0; i < ports; i++) {
                 /* leverage per-port change bits feature */
-                if (ehci->has_ppcd && !(ppcd & (1 << i)))
-                        continue;
-                temp = ehci_readl(ehci, &ehci->regs->port_status [i]);
+                if (ppcd & (1 << i))
+                        temp = ehci_readl(ehci, &ehci->regs->port_status[i]);
+                else
+                        temp = 0;
 
                 /*
                  * Return status information even for ports with OWNER set.
@@ -870,10 +871,9 @@ static int ehci_hub_control (
                                 usb_hcd_end_port_resume(&hcd->self, wIndex);
 
                                 /* stop resume signaling */
-                                temp = ehci_readl(ehci, status_reg);
-                                ehci_writel(ehci,
-                                        temp & ~(PORT_RWC_BITS | PORT_RESUME),
-                                        status_reg);
+                                temp &= ~(PORT_RWC_BITS |
+                                                PORT_SUSPEND | PORT_RESUME);
+                                ehci_writel(ehci, temp, status_reg);
                                 clear_bit(wIndex, &ehci->resuming_ports);
                                 retval = handshake(ehci, status_reg,
                                            PORT_RESUME, 0, 2000 /* 2msec */);
@@ -883,7 +883,7 @@ static int ehci_hub_control (
                                                 wIndex + 1, retval);
                                         goto error;
                                 }
-                                temp &= ~(PORT_SUSPEND|PORT_RESUME|(3<<10));
+                                temp = ehci_readl(ehci, status_reg);
                         }
                 }