ASoC: wm8962: Disable clock if wm8962_runtime_resume() fails
Subsystems (3)
PATCH 1/2 ASoC: wm8962: Disable clock if wm8962_runtime_resume() fails
From: Fabio Estevam <[email protected]>
When regulator_bulk_enable() fails inside wm8962_runtime_resume(), we should disable the previously enabled clock.
--- sound/soc/codecs/wm8962.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/codecs/wm8962.c +5 -1
@@ -3800,7 +3800,7 @@ static int wm8962_runtime_resume(struct device *dev)if (ret !=0 ) {dev_err (dev,"Failed to enable supplies: %d\n" , ret); -return ret; + goto disable_clock; }regcache_cache_only (wm8962->regmap, false);
@@ -3838,6 +3838,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)
Signature · 1 line
1.9.1
PATCH 2/2 ASoC: wm8962: Fit error message into a single line
From: Fabio Estevam <[email protected]>
The error message fits well into a single line.
--- sound/soc/codecs/wm8962.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/wm8962.c +1 -2
@@ -3798,8 +3798,7 @@ 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); +dev_err (dev,"Failed to enable supplies: %d\n" , ret); goto disable_clock; }
Signature · 1 line
1.9.1
Re: [PATCH 2/2] ASoC: wm8962: Fit error message into a single line
Quoted 6 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
The error message fits well into a single line.
Signed-off-by Fabio Estevam <[email protected]>---
Thanks,
Charles
Mark Brown
maintainerApplied "ASoC: wm8962: Fit error message into a single line" to the asoc tree
In reply to Fabio EstevamThe patch
ASoC: wm8962: Fit error message into a single line
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
8bfa934e10d99b524bfe80b793e235b9188a7b58Mon Sep 17 00:00:00 2001
From: Fabio Estevam <[email protected]>
Date: Mon, 28 Mar 2016 08:31:19 -0300
Subject: [PATCH] ASoC: wm8962: Fit error message into a single line
The error message fits well into a single line.
--- sound/soc/codecs/wm8962.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/wm8962.c +1 -2
@@ -3798,8 +3798,7 @@ 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); +dev_err (dev,"Failed to enable supplies: %d\n" , ret); goto disable_clock; }
Signature · 1 line
2.8.0.rc3
Quoted 7 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
When
regulator_bulk_enable()fails insidewm8962_runtime_resume(), we should disable the previously enabled clock.Signed-off-by Fabio Estevam <[email protected]>---
Thanks,
Charles
Mark Brown
maintainerApplied "ASoC: wm8962: Disable clock if wm8962_runtime_resume() fails" to the asoc tree
In reply to Fabio EstevamThe patch
ASoC: wm8962: Disable clock if wm8962_runtime_resume() fails
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
65147846796bd443972d9055b3b4c1339e15d53aMon Sep 17 00:00:00 2001
From: Fabio Estevam <[email protected]>
Date: Mon, 28 Mar 2016 08:31:18 -0300
Subject: [PATCH] ASoC: wm8962: Disable clock if wm8962_runtime_resume() fails
When regulator_bulk_enable() fails inside wm8962_runtime_resume(), we should disable the previously enabled clock.
--- sound/soc/codecs/wm8962.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/codecs/wm8962.c +5 -1
@@ -3800,7 +3800,7 @@ static int wm8962_runtime_resume(struct device *dev)if (ret !=0 ) {dev_err (dev,"Failed to enable supplies: %d\n" , ret); -return ret; + goto disable_clock; }regcache_cache_only (wm8962->regmap, false);
@@ -3838,6 +3838,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)
Signature · 1 line
2.8.0.rc3