diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 02:05:39 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 02:05:39 -0400 |
| commit | 00111076f725ec498f5ada19cdd984d111b0e9b3 (patch) | |
| tree | d7d08779bfc836382537c23298613f5948368bdc /drivers/usb/host/ehci-orion.c | |
| parent | 133b170f08d6c20578f25b1ae71f80a5e638ccb6 (diff) | |
| parent | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 into sh/hwblk
Diffstat (limited to 'drivers/usb/host/ehci-orion.c')
| -rw-r--r-- | drivers/usb/host/ehci-orion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index dc2ac613a9d1..1d283e1b2b8d 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
| @@ -105,6 +105,7 @@ static int ehci_orion_setup(struct usb_hcd *hcd) | |||
| 105 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 105 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
| 106 | int retval; | 106 | int retval; |
| 107 | 107 | ||
| 108 | ehci_reset(ehci); | ||
| 108 | retval = ehci_halt(ehci); | 109 | retval = ehci_halt(ehci); |
| 109 | if (retval) | 110 | if (retval) |
| 110 | return retval; | 111 | return retval; |
| @@ -118,7 +119,6 @@ static int ehci_orion_setup(struct usb_hcd *hcd) | |||
| 118 | 119 | ||
| 119 | hcd->has_tt = 1; | 120 | hcd->has_tt = 1; |
| 120 | 121 | ||
| 121 | ehci_reset(ehci); | ||
| 122 | ehci_port_power(ehci, 0); | 122 | ehci_port_power(ehci, 0); |
| 123 | 123 | ||
| 124 | return retval; | 124 | return retval; |