Merge 3.16-rc4 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 013aabb5b379..f07be65b4e70 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -936,7 +936,7 @@ int xhci_suspend(struct xhci_hcd *xhci)
  */
 int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 {
-        u32                     command, temp = 0;
+        u32                     command, temp = 0, status;
         struct usb_hcd          *hcd = xhci_to_hcd(xhci);
         struct usb_hcd          *secondary_hcd;
         int                     retval = 0;
@@ -1054,8 +1054,12 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 
  done:
         if (retval == 0) {
-                usb_hcd_resume_root_hub(hcd);
-                usb_hcd_resume_root_hub(xhci->shared_hcd);
+                /* Resume root hubs only when have pending events. */
+                status = readl(&xhci->op_regs->status);
+                if (status & STS_EINT) {
+                        usb_hcd_resume_root_hub(hcd);
+                        usb_hcd_resume_root_hub(xhci->shared_hcd);
+                }
         }
 
         /*