diff options
author | Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-05-27 10:46:22 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-05-27 14:48:54 +0100 |
commit | 920bef64cc5fa0e955be357bfc876179729df216 (patch) | |
tree | 3ca8d61b53715a1274f6da4c47c237036f29c879 /sound | |
parent | 53865b3259554389e40aeead392151c819b52a71 (diff) | |
download | linux-stable-920bef64cc5fa0e955be357bfc876179729df216.tar.gz linux-stable-920bef64cc5fa0e955be357bfc876179729df216.tar.bz2 linux-stable-920bef64cc5fa0e955be357bfc876179729df216.zip |
ASoC: wm8962: Fix runtime PM imbalance on error
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>
Link: https://lore.kernel.org/r/20200527024625.9937-1-dinghao.liu@zju.edu.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8962.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 08d19df8a700..1cc23a05ffe4 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2880,6 +2880,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; } @@ -3012,6 +3013,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; } |