luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2016-05-27 13:46:02 +01:00
commit bf65921380
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/codecs/wm8962.c
View File

@ -3798,9 +3798,8 @@ static int wm8962_runtime_resume(struct device *dev)
ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies),
wm8962->supplies); wm8962->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(dev, dev_err(dev, "Failed to enable supplies: %d\n", ret);
"Failed to enable supplies: %d\n", ret); goto disable_clock;
return ret;
} }
regcache_cache_only(wm8962->regmap, false); regcache_cache_only(wm8962->regmap, false);
@ -3838,6 +3837,10 @@ static int wm8962_runtime_resume(struct device *dev)
msleep(5); msleep(5);
return 0; return 0;
disable_clock:
clk_disable_unprepare(wm8962->pdata.mclk);
return ret;
} }
static int wm8962_runtime_suspend(struct device *dev) static int wm8962_runtime_suspend(struct device *dev)

6
sound/soc/codecs/wm8962.h
View File

@ -16,9 +16,9 @@
#include <asm/types.h> #include <asm/types.h>
#include <sound/soc.h> #include <sound/soc.h>
#define WM8962_SYSCLK_MCLK 1 #define WM8962_SYSCLK_MCLK 0
#define WM8962_SYSCLK_FLL 2 #define WM8962_SYSCLK_FLL 1
#define WM8962_SYSCLK_PLL3 3 #define WM8962_SYSCLK_PLL3 2
#define WM8962_FLL 1 #define WM8962_FLL 1