Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57622aef authored by Jiada Wang's avatar Jiada Wang Committed by Mark Brown
Browse files

ASoC: wm8962: balance pm_runtime_enable 



pm_runtime_enable is called in probe to enable runtime PM
for wm8962 codec, but pm_runtime_disable isn't called in remove
callback, nor is called in error path if probe fails after runtime
PM is enabled, this causes unbalanced pm_runtime_enable.

This patch Adds pm_runtime_disable in remove callback and error path,
to balance pm_runtime_enable.

Signed-off-by: default avatarJiada Wang <jiada_wang@mentor.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6ff33f39

sound/soc/codecs/wm8962.c

+4 −1
Original line number Diff line number Diff line
@@ -3759,7 +3759,7 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, 
	ret = snd_soc_register_codec(&i2c->dev,

				     &soc_codec_dev_wm8962, &wm8962_dai, 1);

	if (ret < 0)

		goto err_enable;

		goto err_pm_runtime;



	regcache_cache_only(wm8962->regmap, true);
@@ -3768,6 +3768,8 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, 


	return 0;



err_pm_runtime:

	pm_runtime_disable(&i2c->dev);

err_enable:

	regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);

err:
@@ -3777,6 +3779,7 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, 
static int wm8962_i2c_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);

	pm_runtime_disable(&client->dev);

	return 0;

}