* [PATCH] ASoC: wm8962: Fix runtime PM imbalance on error
@ 2020-05-27 2:46 ` Dinghao Liu
0 siblings, 0 replies; 6+ messages in thread
From: Dinghao Liu @ 2020-05-27 2:46 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Thomas Gleixner, Enrico Weigelt, Kate Stewart, Shengjiu Wang,
patches, alsa-devel, linux-kernel
pm_runtime_get_sync() increments the runtime PM usage counter even
the call returns an error code. Thus a pairing decrement is needed
on the error handling path to keep the counter balanced.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
sound/soc/codecs/wm8962.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index d9d59f45833f..bb806b195d10 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2881,6 +2881,7 @@ static int wm8962_set_fll(struct snd_soc_component *component, int fll_id, int s
ret = pm_runtime_get_sync(component->dev);
if (ret < 0) {
+ pm_runtime_put_noidle(component->dev);
dev_err(component->dev, "Failed to resume device: %d\n", ret);
return ret;
}
@@ -3013,6 +3014,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)
ret = pm_runtime_get_sync(dev);
if (ret < 0) {
+ pm_runtime_put_noidle(dev);
dev_err(dev, "Failed to resume: %d\n", ret);
return IRQ_NONE;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ASoC: wm8962: Fix runtime PM imbalance on error
@ 2020-05-27 2:46 ` Dinghao Liu
0 siblings, 0 replies; 6+ messages in thread
From: Dinghao Liu @ 2020-05-27 2:46 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Kate Stewart, alsa-devel, patches, Shengjiu Wang, Takashi Iwai,
Liam Girdwood, Mark Brown, Thomas Gleixner, Enrico Weigelt,
linux-kernel
pm_runtime_get_sync() increments the runtime PM usage counter even
the call returns an error code. Thus a pairing decrement is needed
on the error handling path to keep the counter balanced.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
sound/soc/codecs/wm8962.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index d9d59f45833f..bb806b195d10 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2881,6 +2881,7 @@ static int wm8962_set_fll(struct snd_soc_component *component, int fll_id, int s
ret = pm_runtime_get_sync(component->dev);
if (ret < 0) {
+ pm_runtime_put_noidle(component->dev);
dev_err(component->dev, "Failed to resume device: %d\n", ret);
return ret;
}
@@ -3013,6 +3014,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)
ret = pm_runtime_get_sync(dev);
if (ret < 0) {
+ pm_runtime_put_noidle(dev);
dev_err(dev, "Failed to resume: %d\n", ret);
return IRQ_NONE;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: wm8962: Fix runtime PM imbalance on error
2020-05-27 2:46 ` Dinghao Liu
@ 2020-05-27 8:27 ` Charles Keepax
-1 siblings, 0 replies; 6+ messages in thread
From: Charles Keepax @ 2020-05-27 8:27 UTC (permalink / raw)
To: Dinghao Liu
Cc: kjlu, Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Thomas Gleixner, Enrico Weigelt, Kate Stewart, Shengjiu Wang,
patches, alsa-devel, linux-kernel
On Wed, May 27, 2020 at 10:46:22AM +0800, Dinghao Liu wrote:
> pm_runtime_get_sync() increments the runtime PM usage counter even
> the call returns an error code. Thus a pairing decrement is needed
> on the error handling path to keep the counter balanced.
>
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: wm8962: Fix runtime PM imbalance on error
@ 2020-05-27 8:27 ` Charles Keepax
0 siblings, 0 replies; 6+ messages in thread
From: Charles Keepax @ 2020-05-27 8:27 UTC (permalink / raw)
To: Dinghao Liu
Cc: Kate Stewart, alsa-devel, patches, Shengjiu Wang, kjlu,
Takashi Iwai, Liam Girdwood, Mark Brown, Thomas Gleixner,
Enrico Weigelt, linux-kernel
On Wed, May 27, 2020 at 10:46:22AM +0800, Dinghao Liu wrote:
> pm_runtime_get_sync() increments the runtime PM usage counter even
> the call returns an error code. Thus a pairing decrement is needed
> on the error handling path to keep the counter balanced.
>
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: wm8962: Fix runtime PM imbalance on error
2020-05-27 2:46 ` Dinghao Liu
@ 2020-05-27 14:57 ` Mark Brown
-1 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-05-27 14:57 UTC (permalink / raw)
To: Dinghao Liu, kjlu
Cc: Enrico Weigelt, linux-kernel, Shengjiu Wang, Kate Stewart,
alsa-devel, Takashi Iwai, patches, Liam Girdwood,
Thomas Gleixner
On Wed, 27 May 2020 10:46:22 +0800, Dinghao Liu wrote:
> pm_runtime_get_sync() increments the runtime PM usage counter even
> the call returns an error code. Thus a pairing decrement is needed
> on the error handling path to keep the counter balanced.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: wm8962: Fix runtime PM imbalance on error
commit: 920bef64cc5fa0e955be357bfc876179729df216
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: wm8962: Fix runtime PM imbalance on error
@ 2020-05-27 14:57 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-05-27 14:57 UTC (permalink / raw)
To: Dinghao Liu, kjlu
Cc: Kate Stewart, alsa-devel, Liam Girdwood, patches, Shengjiu Wang,
linux-kernel, Takashi Iwai, Thomas Gleixner, Enrico Weigelt
On Wed, 27 May 2020 10:46:22 +0800, Dinghao Liu wrote:
> pm_runtime_get_sync() increments the runtime PM usage counter even
> the call returns an error code. Thus a pairing decrement is needed
> on the error handling path to keep the counter balanced.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: wm8962: Fix runtime PM imbalance on error
commit: 920bef64cc5fa0e955be357bfc876179729df216
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-27 14:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-27 2:46 [PATCH] ASoC: wm8962: Fix runtime PM imbalance on error Dinghao Liu
2020-05-27 2:46 ` Dinghao Liu
2020-05-27 8:27 ` Charles Keepax
2020-05-27 8:27 ` Charles Keepax
2020-05-27 14:57 ` Mark Brown
2020-05-27 14:57 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.