From: Heiko Stübner Date: Fri, 14 Oct 2011 16:00:29 +0000 (+0200) Subject: regulator: Fix possible nullpointer dereference in regulator_enable() X-Git-Tag: next-20111025~37^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d1685e4e2c3854782272f32b71f2f3eff5c6e0d0;p=karo-tx-linux.git regulator: Fix possible nullpointer dereference in regulator_enable() In the case where _regulator_enable returns an error it was not checked if a supplying regulator exists before trying to disable it, leading to a null pointer-dereference if no supplying regulator existed. Signed-off-by: Heiko Stuebner Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 9a33fe2021b6..87d9328f1695 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1425,7 +1425,7 @@ int regulator_enable(struct regulator *regulator) ret = _regulator_enable(rdev); mutex_unlock(&rdev->mutex); - if (ret != 0) + if (ret != 0 && rdev->supply) regulator_disable(rdev->supply); return ret;