summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-17 17:20:15 +0100
committerMark Brown <broonie@linaro.org>2013-06-17 17:20:15 +0100
commit06b753d6fd139acf37f4f99c2cfffc2e74841a7c (patch)
tree5e336c12eb4f3005a6b517d972fae7fe58038420 /drivers/misc
parent9912b30f95e22d5722abc225c1c3784a51643aef (diff)
parent6f0d94790efe9f4481bbd7c174ef0e9b5e5db7c4 (diff)
downloadlinux-06b753d6fd139acf37f4f99c2cfffc2e74841a7c.tar.gz
linux-06b753d6fd139acf37f4f99c2cfffc2e74841a7c.tar.bz2
linux-06b753d6fd139acf37f4f99c2cfffc2e74841a7c.zip
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/atmel-ssc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index 1abd5ad59925..f7b90661e321 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -58,7 +58,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
ssc->user++;
spin_unlock(&user_lock);
- clk_enable(ssc->clk);
+ clk_prepare_enable(ssc->clk);
return ssc;
}
@@ -69,7 +69,7 @@ void ssc_free(struct ssc_device *ssc)
spin_lock(&user_lock);
if (ssc->user) {
ssc->user--;
- clk_disable(ssc->clk);
+ clk_disable_unprepare(ssc->clk);
} else {
dev_dbg(&ssc->pdev->dev, "device already free\n");
}
@@ -167,10 +167,10 @@ static int ssc_probe(struct platform_device *pdev)
}
/* disable all interrupts */
- clk_enable(ssc->clk);
+ clk_prepare_enable(ssc->clk);
ssc_writel(ssc->regs, IDR, -1);
ssc_readl(ssc->regs, SR);
- clk_disable(ssc->clk);
+ clk_disable_unprepare(ssc->clk);
ssc->irq = platform_get_irq(pdev, 0);
if (!ssc->irq) {