Commit baec7967 authored Jun 09, 2023 by Amelie Delaunay Committed by Greg Kroah-Hartman Jul 27, 2023

mfd: stmfx: Fix error path in stmfx_chip_init



[ Upstream commit f592cf624531286f8b52e40dcfc157a5a7fb115c ]

In error path, disable vdd regulator if it exists, but don't overload ret.
Because if regulator_disable() is successful, stmfx_chip_init will exit
successfully while chip init failed.

Fixes: 06252ade ("mfd: Add ST Multi-Function eXpander (STMFX) core driver")
Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
Link: https://lore.kernel.org/r/20230609092804.793100-1-amelie.delaunay@foss.st.com


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

parent 5d26f134

drivers/mfd/stmfx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,7 @@ static int stmfx_chip_init(struct i2c_client *client)

		err:
		if (stmfx->vdd)
		return regulator_disable(stmfx->vdd);
		regulator_disable(stmfx->vdd);

		return ret;
		}