aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-02-18 18:41:14 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-03-20 18:05:24 +0400
commit3896c8e6399e6bc73ddbd63de0734b48f9b749f2 (patch)
treef48fb8f1c5ddf1281431c8d43f3d5f9876c1b046 /drivers/mfd
parent8de6c59277e7e5d83e75a2239a129c81dd865d86 (diff)
downloadvexpress-lsk-3896c8e6399e6bc73ddbd63de0734b48f9b749f2.tar.gz
MFD: omap-usb-host hack: replace clk_enable with clk_prepare_enable
..for aux_clk in usbhs_runtime_resume(). Otherwise clk_enable() fails with -ESHUTDOWN due to the clock not having been prepared. Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/omap-usb-host.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 192addd1197..21af9abf7e1 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -285,7 +285,7 @@ static int usbhs_runtime_resume(struct device *dev)
for (i = 0; i < omap->nports; i++) {
if (!IS_ERR(omap->aux_clk[i])) {
- r = clk_enable(omap->aux_clk[i]);
+ r = clk_prepare_enable(omap->aux_clk[i]);
if (r) {
dev_err(dev,
"Can't enable port %d aux clk %d\n", i, r);