diff options
| author | Mark Brown <broonie@kernel.org> | 2020-11-12 19:35:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-12 19:35:47 +0000 |
| commit | 76462effbd29525b2f12cefb645fe994f777d3ba (patch) | |
| tree | 8434481e61a3fe5ac1c95efa4ab40a8a53ce87b8 | |
| parent | c31da0b196f99c7d95c69bab96e709b72a30f509 (diff) | |
| parent | 5e7aace13df24ff72511f29c14ebbfe638ef733c (diff) | |
| download | linux-76462effbd29525b2f12cefb645fe994f777d3ba.tar.bz2 | |
Merge series "ASoC: Fix error handling in wm899x" from Zhang Qilong <zhangqilong3@huawei.com>:
The first patch fixed a wrong free in wm8997_probe. The
remaining three patches fixed PM disable depth imbalance
on error handling.
Zhang Qilong (4):
ASoC: arizona: Fix a wrong free in wm8997_probe
ASoC: arizona: Fix PM disable depth imbalance on error
ASoC: wm8994: Fix PM disable depth imbalance on error
ASoC: wm8998: Fix PM disable depth imbalance on error
sound/soc/codecs/wm8994.c | 6 +++++-
sound/soc/codecs/wm8997.c | 8 ++++++--
sound/soc/codecs/wm8998.c | 4 +++-
3 files changed, 14 insertions(+), 4 deletions(-)
--
2.25.4
| -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); |