diff options
| author | Zhang Qilong <zhangqilong3@huawei.com> | 2020-11-11 14:09:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-12 16:14:37 +0100 |
| commit | 5e7aace13df24ff72511f29c14ebbfe638ef733c (patch) | |
| tree | a5ec35aeaad3c7656fa300954fb5af79dc6424ba | |
| parent | Merge series "Fix PM disable depth imbalance on error" from Zhang Qilong <zha... (diff) | |
| download | linux-5e7aace13df24ff72511f29c14ebbfe638ef733c.tar.xz linux-5e7aace13df24ff72511f29c14ebbfe638ef733c.zip | |
ASoC: arizona: Fix a wrong free in wm8997_probe
In the normal path, we should not free the arizona,
we should return immediately. It will be free when
call remove operation.
Fixes: 31833ead95c2c ("ASoC: arizona: Move request of speaker IRQs into bus probe")
Reported-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Acked-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20201111130923.220186-2-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/wm8997.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index 37e4bb3dbd8a..229f2986cd96 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1177,6 +1177,8 @@ static int wm8997_probe(struct platform_device *pdev) goto err_spk_irqs; } + return ret; + err_spk_irqs: arizona_free_spk_irqs(arizona); |