diff options
| author | Benoit Goby <benoit@android.com> | 2011-02-28 17:40:54 -0800 |
|---|---|---|
| committer | Benoit Goby <benoit@android.com> | 2011-03-01 17:11:56 -0800 |
| commit | 730a86cc352c22c484686bcad62ce24d5d3f9d7e (patch) | |
| tree | 6d16f54c227411025b88ffb334f69e283b91b2ed | |
| parent | aaf98d1380d04fa16584f41b5b4fcf184b9eac85 (diff) | |
Revert "usb: host: ehci-hcd: add controller_resets_phy quirk"
This reverts commit 2c7d591aa11086ba841f8712b7cee33e245b62f6.
Change-Id: Ic9994dafc424e16d5d8251c287f8be65832b611b
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 3 | ||||
| -rw-r--r-- | drivers/usb/host/ehci.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 74cc97b80c4b..794a104a1e4c 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -259,8 +259,7 @@ static int ehci_reset (struct ehci_hcd *ehci) command |= CMD_RESET; dbg_cmd (ehci, "reset", command); - if (!ehci->controller_resets_phy) - ehci_writel(ehci, command, &ehci->regs->command); + ehci_writel(ehci, command, &ehci->regs->command); ehci_to_hcd(ehci)->state = HC_STATE_HALT; ehci->next_statechange = jiffies; retval = handshake (ehci, &ehci->regs->command, diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 530540a4bdd4..6f62e68e0e6f 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -132,7 +132,6 @@ struct ehci_hcd { /* one per controller */ unsigned need_io_watchdog:1; unsigned broken_periodic:1; unsigned fs_i_thresh:1; /* Intel iso scheduling */ - unsigned controller_resets_phy:1; unsigned port_reset_no_wait:1; /* required for usb32 quirk */ |