aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-hcd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
-rw-r--r--drivers/usb/host/ehci-hcd.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 4a3bc5b7a06f..a87c0573c860 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -417,9 +417,6 @@ static void ehci_iaa_watchdog(unsigned long param)
417 * CMD_IAAD when it sets STS_IAA.) 417 * CMD_IAAD when it sets STS_IAA.)
418 */ 418 */
419 cmd = ehci_readl(ehci, &ehci->regs->command); 419 cmd = ehci_readl(ehci, &ehci->regs->command);
420 if (cmd & CMD_IAAD)
421 ehci_writel(ehci, cmd & ~CMD_IAAD,
422 &ehci->regs->command);
423 420
424 /* If IAA is set here it either legitimately triggered 421 /* If IAA is set here it either legitimately triggered
425 * before we cleared IAAD above (but _way_ late, so we'll 422 * before we cleared IAAD above (but _way_ late, so we'll
@@ -894,11 +891,8 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
894 /* complete the unlinking of some qh [4.15.2.3] */ 891 /* complete the unlinking of some qh [4.15.2.3] */
895 if (status & STS_IAA) { 892 if (status & STS_IAA) {
896 /* guard against (alleged) silicon errata */ 893 /* guard against (alleged) silicon errata */
897 if (cmd & CMD_IAAD) { 894 if (cmd & CMD_IAAD)
898 ehci_writel(ehci, cmd & ~CMD_IAAD,
899 &ehci->regs->command);
900 ehci_dbg(ehci, "IAA with IAAD still set?\n"); 895 ehci_dbg(ehci, "IAA with IAAD still set?\n");
901 }
902 if (ehci->reclaim) { 896 if (ehci->reclaim) {
903 COUNT(ehci->stats.reclaim); 897 COUNT(ehci->stats.reclaim);
904 end_unlink_async(ehci); 898 end_unlink_async(ehci);
@@ -1378,6 +1372,11 @@ MODULE_LICENSE ("GPL");
1378#define PLATFORM_DRIVER ehci_ls1x_driver 1372#define PLATFORM_DRIVER ehci_ls1x_driver
1379#endif 1373#endif
1380 1374
1375#ifdef CONFIG_MIPS_SEAD3
1376#include "ehci-sead3.c"
1377#define PLATFORM_DRIVER ehci_hcd_sead3_driver
1378#endif
1379
1381#ifdef CONFIG_USB_EHCI_HCD_PLATFORM 1380#ifdef CONFIG_USB_EHCI_HCD_PLATFORM
1382#include "ehci-platform.c" 1381#include "ehci-platform.c"
1383#define PLATFORM_DRIVER ehci_platform_driver 1382#define PLATFORM_DRIVER ehci_platform_driver