Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / usb / host / ehci-hub.c

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 8a515f0d59880dae68d8c55fcd885fc914c6d71b..d05ea03cfb4d4d8aeae6a8db0db7559cebed6b82 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -106,6 +106,27 @@ static void ehci_handover_companion_ports(struct ehci_hcd *ehci)
        ehci->owned_ports = 0;
 }
 
+static int ehci_port_change(struct ehci_hcd *ehci)
+{
+       int i = HCS_N_PORTS(ehci->hcs_params);
+
+       /* First check if the controller indicates a change event */
+
+       if (ehci_readl(ehci, &ehci->regs->status) & STS_PCD)
+               return 1;
+
+       /*
+        * Not all controllers appear to update this while going from D3 to D0,
+        * so check the individual port status registers as well
+        */
+
+       while (i--)
+               if (ehci_readl(ehci, &ehci->regs->port_status[i]) & PORT_CSC)
+                       return 1;
+
+       return 0;
+}
+
 static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
                bool suspending, bool do_wakeup)
 {
@@ -173,7 +194,7 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
        }
 
        /* Does the root hub have a port wakeup pending? */
-       if (!suspending && (ehci_readl(ehci, &ehci->regs->status) & STS_PCD))
+       if (!suspending && ehci_port_change(ehci))
                usb_hcd_resume_root_hub(ehci_to_hcd(ehci));
 
        spin_unlock_irqrestore(&ehci->lock, flags);
@@ -538,14 +559,15 @@ static ssize_t store_companion(struct device *dev,
 }
 static DEVICE_ATTR(companion, 0644, show_companion, store_companion);
 
-static inline void create_companion_file(struct ehci_hcd *ehci)
+static inline int create_companion_file(struct ehci_hcd *ehci)
 {
-       int     i;
+       int     i = 0;
 
        /* with integrated TT there is no companion! */
        if (!ehci_is_TDI(ehci))
                i = device_create_file(ehci_to_hcd(ehci)->self.controller,
                                       &dev_attr_companion);
+       return i;
 }
 
 static inline void remove_companion_file(struct ehci_hcd *ehci)
@@ -695,8 +717,8 @@ ehci_hub_descriptor (
        desc->bDescLength = 7 + 2 * temp;
 
        /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
-       memset (&desc->bitmap [0], 0, temp);
-       memset (&desc->bitmap [temp], 0xff, temp);
+       memset(&desc->u.hs.DeviceRemovable[0], 0, temp);
+       memset(&desc->u.hs.DeviceRemovable[temp], 0xff, temp);
 
        temp = 0x0008;                  /* per-port overcurrent reporting */
        if (HCS_PPC (ehci->hcs_params))