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

Commit f8755e6c authored by Zheyu Ma's avatar Zheyu Ma Committed by Greg Kroah-Hartman
Browse files

ASoC: wm8731: Disable the regulator when probing fails 



[ Upstream commit 92ccbf17eeacf510cf1eed9c252d9332ca24f02d ]

When the driver fails during probing, the driver should disable the
regulator, not just handle it in wm8731_hw_init().

The following log reveals it:

[   17.812483] WARNING: CPU: 1 PID: 364 at drivers/regulator/core.c:2257 _regulator_put+0x3ec/0x4e0
[   17.815958] RIP: 0010:_regulator_put+0x3ec/0x4e0
[   17.824467] Call Trace:
[   17.824774]  <TASK>
[   17.825040]  regulator_bulk_free+0x82/0xe0
[   17.825514]  devres_release_group+0x319/0x3d0
[   17.825882]  i2c_device_probe+0x766/0x940
[   17.829198]  i2c_register_driver+0xb5/0x130

Signed-off-by: default avatarZheyu Ma <zheyuma97@gmail.com>
Link: https://lore.kernel.org/r/20220405121038.4094051-1-zheyuma97@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent af46047a

sound/soc/codecs/wm8731.c

+11 −8
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731) 
	ret = wm8731_reset(wm8731->regmap);

	if (ret < 0) {

		dev_err(dev, "Failed to issue reset: %d\n", ret);

		goto err_regulator_enable;

		goto err;

	}



	/* Clear POWEROFF, keep everything else disabled */
@@ -621,10 +621,7 @@ static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731) 


	regcache_mark_dirty(wm8731->regmap);



err_regulator_enable:

	/* Regulators will be enabled by bias management */

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



err:

	return ret;

}
@@ -768,21 +765,27 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, 
		ret = PTR_ERR(wm8731->regmap);

		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",

			ret);

		return ret;

		goto err_regulator_enable;

	}



	ret = wm8731_hw_init(&i2c->dev, wm8731);

	if (ret != 0)

		return ret;

		goto err_regulator_enable;



	ret = devm_snd_soc_register_component(&i2c->dev,

			&soc_component_dev_wm8731, &wm8731_dai, 1);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);

		return ret;

		goto err_regulator_enable;

	}



	return 0;



err_regulator_enable:

	/* Regulators will be enabled by bias management */

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



	return ret;

}



static int wm8731_i2c_remove(struct i2c_client *client)