Commit 104d32bd authored Jun 17, 2023 by Christophe JAILLET Committed by Lee Jones Jun 21, 2023

mfd: stmpe: Only disable the regulators if they are enabled



In stmpe_probe(), if some regulator_enable() calls fail, probing continues
and there is only a dev_warn().

So, if stmpe_probe() is called the regulator may not be enabled. It is
cleaner to test it before calling regulator_disable() in the remove
function.

Fixes: 9c9e3214 ("mfd: stmpe: add optional regulators")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/8de3aaf297931d655b9ad6aed548f4de8b85425a.1686998575.git.christophe.jaillet@wanadoo.fr


Signed-off-by: Lee Jones <lee@kernel.org>

parent e0cbc202

drivers/mfd/stmpe.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1485,9 +1485,9 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)

	void stmpe_remove(struct stmpe *stmpe)		void stmpe_remove(struct stmpe *stmpe)
	{		{
	if (!IS_ERR(stmpe->vio))		if (!IS_ERR(stmpe->vio) && regulator_is_enabled(stmpe->vio))
	regulator_disable(stmpe->vio);		regulator_disable(stmpe->vio);
	if (!IS_ERR(stmpe->vcc))		if (!IS_ERR(stmpe->vcc) && regulator_is_enabled(stmpe->vcc))
	regulator_disable(stmpe->vcc);		regulator_disable(stmpe->vcc);

	__stmpe_disable(stmpe, STMPE_BLOCK_ADC);		__stmpe_disable(stmpe, STMPE_BLOCK_ADC);