diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-04 00:34:14 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-04 00:34:14 +0400 |
| commit | e1482a1708e48add8d2f4ecc949885e0e552d9e8 (patch) | |
| tree | ab97efb5785f77ed83292c97ba9e5909cfee8fba /sound | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
| parent | 6abda3e129bfe4d74b5c274da7dff0e2b1488818 (diff) | |
| download | linux-e1482a1708e48add8d2f4ecc949885e0e552d9e8.tar.xz | |
Merge branch 'mxs/clk-prepare' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx/clk
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/mxs/mxs-saif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 76dc74d24fc2..ef1abb53af95 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -210,7 +210,7 @@ int mxs_saif_put_mclk(unsigned int saif_id) return -EBUSY; } - clk_disable(saif->clk); + clk_disable_unprepare(saif->clk); /* disable MCLK output */ __raw_writel(BM_SAIF_CTRL_CLKGATE, @@ -264,7 +264,7 @@ int mxs_saif_get_mclk(unsigned int saif_id, unsigned int mclk, if (ret) return ret; - ret = clk_enable(saif->clk); + ret = clk_prepare_enable(saif->clk); if (ret) return ret; |