]> www.infradead.org Git - users/willy/xarray.git/commitdiff
ASoC: wm8962: Fix runtime PM imbalance on error
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Wed, 27 May 2020 02:46:22 +0000 (10:46 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 27 May 2020 13:48:54 +0000 (14:48 +0100)
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>
sound/soc/codecs/wm8962.c

index 08d19df8a700505b709d854742794ef9890a192a..1cc23a05ffe46dc5c5be1ba2df34ee3128caeaab 100644 (file)
@@ -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;
        }