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

[ Upstream commit 104d32bd81f620bb9f67fbf7d1159c414e89f05f ]

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: 9c9e321455fb ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 722ad2c368a56bce6f9bde915bcf72a787b053c9..d752c56d60e42dffc54d7f122624e562a5afaadf 100644 (file)
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1428,9 +1428,9 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)
 
 int stmpe_remove(struct stmpe *stmpe)
 {
-       if (!IS_ERR(stmpe->vio))
+       if (!IS_ERR(stmpe->vio) && regulator_is_enabled(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);
 
        mfd_remove_devices(stmpe->dev);