projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-4.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[deliverable/linux.git]
/
sound
/
soc
/
codecs
/
wm8962.c
diff --git
a/sound/soc/codecs/wm8962.c
b/sound/soc/codecs/wm8962.c
index fc164d69a557e92759252b48e9a786ab07780e88..f3109da247692377d1240ebd72b58fe16d8683cf 100644
(file)
--- a/
sound/soc/codecs/wm8962.c
+++ b/
sound/soc/codecs/wm8962.c
@@
-3793,9
+3793,8
@@
static int wm8962_runtime_resume(struct device *dev)
ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies),
wm8962->supplies);
if (ret != 0) {
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);
}
regcache_cache_only(wm8962->regmap, false);
@@
-3833,6
+3832,10
@@
static int wm8962_runtime_resume(struct device *dev)
msleep(5);
return 0;
msleep(5);
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)
This page took
0.048888 seconds
and
5
git commands to generate.