aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/ehci-hcd.c4
-rw-r--r--drivers/usb/host/ehci-hub.c9
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 303b0222cd6d..fcf8b940e867 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -758,7 +758,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
758 /* remote wakeup [4.3.1] */ 758 /* remote wakeup [4.3.1] */
759 if (status & STS_PCD) { 759 if (status & STS_PCD) {
760 unsigned i = HCS_N_PORTS (ehci->hcs_params); 760 unsigned i = HCS_N_PORTS (ehci->hcs_params);
761 u32 ppcd = 0; 761 u32 ppcd = ~0;
762 762
763 /* kick root hub later */ 763 /* kick root hub later */
764 pcd_status = status; 764 pcd_status = status;
@@ -775,7 +775,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
775 int pstatus; 775 int pstatus;
776 776
777 /* leverage per-port change bits feature */ 777 /* leverage per-port change bits feature */
778 if (ehci->has_ppcd && !(ppcd & (1 << i))) 778 if (!(ppcd & (1 << i)))
779 continue; 779 continue;
780 pstatus = ehci_readl(ehci, 780 pstatus = ehci_readl(ehci,
781 &ehci->regs->port_status[i]); 781 &ehci->regs->port_status[i]);
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 4d3b294f203e..576b735f49b6 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -590,7 +590,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
590 u32 mask; 590 u32 mask;
591 int ports, i, retval = 1; 591 int ports, i, retval = 1;
592 unsigned long flags; 592 unsigned long flags;
593 u32 ppcd = 0; 593 u32 ppcd = ~0;
594 594
595 /* init status to no-changes */ 595 /* init status to no-changes */
596 buf [0] = 0; 596 buf [0] = 0;
@@ -628,9 +628,10 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
628 628
629 for (i = 0; i < ports; i++) { 629 for (i = 0; i < ports; i++) {
630 /* leverage per-port change bits feature */ 630 /* leverage per-port change bits feature */
631 if (ehci->has_ppcd && !(ppcd & (1 << i))) 631 if (ppcd & (1 << i))
632 continue; 632 temp = ehci_readl(ehci, &ehci->regs->port_status[i]);
633 temp = ehci_readl(ehci, &ehci->regs->port_status [i]); 633 else
634 temp = 0;
634 635
635 /* 636 /*
636 * Return status information even for ports with OWNER set. 637 * Return status information even for ports with OWNER set.