diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-27 13:46:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-27 13:46:02 +0100 |
| commit | bf65921380cd50b87618df550398e06581f4a361 (patch) | |
| tree | c47fb83d6031246273bec47d96ad83df9c2e54cc | |
| parent | bc4efdb65938f5afd2bf5e63e871b76876ddf5bd (diff) | |
| parent | 937e92dc50231bb41294262abf56d2bdddc4d38c (diff) | |
| download | linux-next-bf65921380cd50b87618df550398e06581f4a361.tar.gz | |
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 9 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8962.h | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 720a14e0687d..0100e28f40dc 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3798,9 +3798,8 @@ static int wm8962_runtime_resume(struct device *dev) ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); if (ret != 0) { - dev_err(dev, - "Failed to enable supplies: %d\n", ret); - return ret; + dev_err(dev, "Failed to enable supplies: %d\n", ret); + goto disable_clock; } regcache_cache_only(wm8962->regmap, false); @@ -3838,6 +3837,10 @@ static int wm8962_runtime_resume(struct device *dev) msleep(5); return 0; + +disable_clock: + clk_disable_unprepare(wm8962->pdata.mclk); + return ret; } static int wm8962_runtime_suspend(struct device *dev) diff --git a/sound/soc/codecs/wm8962.h b/sound/soc/codecs/wm8962.h index 910aafd09d21..e63a318a3015 100644 --- a/sound/soc/codecs/wm8962.h +++ b/sound/soc/codecs/wm8962.h @@ -16,9 +16,9 @@ #include <asm/types.h> #include <sound/soc.h> -#define WM8962_SYSCLK_MCLK 1 -#define WM8962_SYSCLK_FLL 2 -#define WM8962_SYSCLK_PLL3 3 +#define WM8962_SYSCLK_MCLK 0 +#define WM8962_SYSCLK_FLL 1 +#define WM8962_SYSCLK_PLL3 2 #define WM8962_FLL 1 |