diff options
| author |   Zhang Qilong <zhangqilong3@huawei.com> | 2022-09-29 00:01:16 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-09-29 16:16:24 +0100 |
| commit | b73f11e895e140537e7f8c7251211ccd3ce0782b (patch) | |
| tree | 4ee875a2106162e146acc7afda4a23cbff43bb1e /sound/soc | |
| parent | ASoC: wm5102: Fix PM disable depth imbalance in wm5102_probe (diff) | |
| download | linux-dev-b73f11e895e140537e7f8c7251211ccd3ce0782b.tar.xz linux-dev-b73f11e895e140537e7f8c7251211ccd3ce0782b.zip | |
ASoC: mt6660: Fix PM disable depth imbalance in mt6660_i2c_probe
The pm_runtime_enable will increase power disable depth. Thus
a pairing decrement is needed on the error handling path to
keep it balanced according to context. We fix it by moving
pm_runtime_enable to the endding of mt6660_i2c_probe.
Fixes:f289e55c6eeb4 ("ASoC: Add MediaTek MT6660 Speaker Amp Driver")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20220928160116.125020-5-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/mt6660.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/codecs/mt6660.c b/sound/soc/codecs/mt6660.c index ba11555796ad..45e0df13afb9 100644 --- a/sound/soc/codecs/mt6660.c +++ b/sound/soc/codecs/mt6660.c @@ -503,13 +503,17 @@ static int mt6660_i2c_probe(struct i2c_client *client) dev_err(chip->dev, "read chip revision fail\n"); goto probe_fail; } - pm_runtime_set_active(chip->dev); - pm_runtime_enable(chip->dev); ret = devm_snd_soc_register_component(chip->dev, &mt6660_component_driver, &mt6660_codec_dai, 1); + if (!ret) { + pm_runtime_set_active(chip->dev); + pm_runtime_enable(chip->dev); + } + return ret; + probe_fail: _mt6660_chip_power_on(chip, 0); mutex_destroy(&chip->io_lock); |