diff options
| author | Zhang Qilong <zhangqilong3@huawei.com> | 2020-11-11 21:09:20 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-29 13:46:53 +0100 |
| commit | 524321a0ef36caf0b7a9d3e63812724bc5723ee6 (patch) | |
| tree | 7bc2b9e65926d59274ebda918322b42b4c067d05 /sound/soc | |
| parent | bfb632881b41bed999055f450b2730a1a40bce88 (diff) | |
| download | linux-stable-524321a0ef36caf0b7a9d3e63812724bc5723ee6.tar.gz linux-stable-524321a0ef36caf0b7a9d3e63812724bc5723ee6.tar.bz2 linux-stable-524321a0ef36caf0b7a9d3e63812724bc5723ee6.zip | |
ASoC: arizona: Fix a wrong free in wm8997_probe
[ Upstream commit 5e7aace13df24ff72511f29c14ebbfe638ef733c ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/soc')
| -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 49401a8aae64..19c963801e26 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1179,6 +1179,8 @@ static int wm8997_probe(struct platform_device *pdev) goto err_spk_irqs; } + return ret; + err_spk_irqs: arizona_free_spk_irqs(arizona); |