Merge branch 'usb-linus' into usb-next

This is to pick up the fixes in that branch, and let Alan fix the merge
error in drivers/usb/host/ehci-timer.c better than I just did (as I know
I messed it up...)

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

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

diff --cc drivers/usb/host/ehci-hub.c
Simple merge

diff --cc drivers/usb/host/ehci-timer.c
index 97815d0fc97c7f4d8db88a7ad5268b5466b6f5b1,c3fa1305f830bf53070a6553446428368553691d..dca8fc42b8d77f11928b5f796af86bb1b72dab86
--- 1/drivers/usb/host/ehci-timer.c
--- 2/drivers/usb/host/ehci-timer.c
+++ b/drivers/usb/host/ehci-timer.c
@@@ -295,40 -295,43 +295,31 @@@ static void end_free_itds(struct ehci_h
  /* Handle lost (or very late) IAA interrupts */
  static void ehci_iaa_watchdog(struct ehci_hcd *ehci)
  {
 -      if (ehci->rh_state != EHCI_RH_RUNNING)
 -              return;
 +      u32 cmd, status;
  
--      /*
--       * Lost IAA irqs wedge things badly; seen first with a vt8235.
--       * So we need this watchdog, but must protect it against both
--       * (a) SMP races against real IAA firing and retriggering, and
--       * (b) clean HC shutdown, when IAA watchdog was pending.
-        */
-       if (!ehci->async_iaa || ehci->rh_state != EHCI_RH_RUNNING)
-               return;
- 
 +      /* If we get here, IAA is *REALLY* late.  It's barely
 +       * conceivable that the system is so busy that CMD_IAAD
 +       * is still legitimately set, so let's be sure it's
 +       * clear before we read STS_IAA.  (The HC should clear
 +       * CMD_IAAD when it sets STS_IAA.)
         */
 -      if (1) {
 -              u32 cmd, status;
 -
 -              /* If we get here, IAA is *REALLY* late.  It's barely
 -               * conceivable that the system is so busy that CMD_IAAD
 -               * is still legitimately set, so let's be sure it's
 -               * clear before we read STS_IAA.  (The HC should clear
 -               * CMD_IAAD when it sets STS_IAA.)
 -               */
 -              cmd = ehci_readl(ehci, &ehci->regs->command);
 -
 -              /*
 -               * If IAA is set here it either legitimately triggered
 -               * after the watchdog timer expired (_way_ late, so we'll
 -               * still count it as lost) ... or a silicon erratum:
 -               * - VIA seems to set IAA without triggering the IRQ;
 -               * - IAAD potentially cleared without setting IAA.
 -               */
 -              status = ehci_readl(ehci, &ehci->regs->status);
 -              if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
 -                      COUNT(ehci->stats.lost_iaa);
 -                      ehci_writel(ehci, STS_IAA, &ehci->regs->status);
 -              }
 +      cmd = ehci_readl(ehci, &ehci->regs->command);
  
 -              ehci_vdbg(ehci, "IAA watchdog: status %x cmd %x\n",
 -                              status, cmd);
 -              end_unlink_async(ehci);
 +      /*
 +       * If IAA is set here it either legitimately triggered
 +       * after the watchdog timer expired (_way_ late, so we'll
 +       * still count it as lost) ... or a silicon erratum:
 +       * - VIA seems to set IAA without triggering the IRQ;
 +       * - IAAD potentially cleared without setting IAA.
 +       */
 +      status = ehci_readl(ehci, &ehci->regs->status);
 +      if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
 +              COUNT(ehci->stats.lost_iaa);
 +              ehci_writel(ehci, STS_IAA, &ehci->regs->status);
        }
 +
 +      ehci_dbg(ehci, "IAA watchdog: status %x cmd %x\n", status, cmd);
 +      end_unlink_async(ehci);
  }