diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:45:25 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:45:25 +0200 |
| commit | 89fb2d77d5daa821e3868ea59963f28249974840 (patch) | |
| tree | 6cc80209a208133000c203cf9a9f61dd42fd53a9 /drivers/usb/host/ehci-orion.c | |
| parent | 4297103560b4c5aba904e4711e982a039619f1f6 (diff) | |
| parent | 778435045a416da71f1757a80e37200a5ea5af70 (diff) | |
| download | linux-89fb2d77d5daa821e3868ea59963f28249974840.tar.gz | |
Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3
Merge in branch already pulled. Fulfils dependancies needed by
this patchset.
Diffstat (limited to 'drivers/usb/host/ehci-orion.c')
| -rw-r--r-- | drivers/usb/host/ehci-orion.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 82de1073aa52..c6903e3af29c 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c @@ -298,6 +298,10 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) err4: usb_put_hcd(hcd); err3: + if (!IS_ERR(clk)) { + clk_disable_unprepare(clk); + clk_put(clk); + } iounmap(regs); err2: release_mem_region(res->start, resource_size(res)); |