diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 16:15:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 16:15:30 +0200 |
| commit | a7bdf7fa33127bf08eb0810698bca607a9462df4 (patch) | |
| tree | 2f4be686e49710d10cc4f5ebc2d5f06ae030b9bd /drivers/usb/host/ehci-tegra.c | |
| parent | usb: convert USB_QUIRK_RESET_MORPHS to USB_QUIRK_RESET (diff) | |
| parent | Linux 3.6-rc3 (diff) | |
| download | linux-a7bdf7fa33127bf08eb0810698bca607a9462df4.tar.xz linux-a7bdf7fa33127bf08eb0810698bca607a9462df4.zip | |
Merge v3.6-rc3 into usb-next
This picks up fixes that we need in this branch for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-tegra.c')
| -rw-r--r-- | drivers/usb/host/ehci-tegra.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index ba5039f1c5c2..75eca42dd607 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -789,10 +789,11 @@ static int tegra_ehci_remove(struct platform_device *pdev) #endif usb_remove_hcd(hcd); - usb_put_hcd(hcd); tegra_usb_phy_close(tegra->phy); + usb_put_hcd(hcd); + clk_disable_unprepare(tegra->clk); clk_disable_unprepare(tegra->emc_clk); |