From 937ed7672266b64988a86fdf30556f6fe75034da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heiko=20St=C3=BCbner?= Date: Fri, 14 Oct 2011 18:00:29 +0200 Subject: 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 Cherry-pick from main stream: commit d1685e4e2c3854782272f32b71f2f3eff5c6e0d0 Change-Id: Ie4d8db9184a65e6a98964259299bfc7daa0f4048 Reviewed-on: http://git-master/r/75908 Reviewed-by: Pavan Kunapuli Signed-off-by: Laxman Dewangan Signed-off-by: Varun Wadekar Reviewed-on: http://git-master/r/76462 Reviewed-by: Automatic_Commit_Validation_User --- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/regulator/core.c') diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 79d670c913e2..1b7d64118e4d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1432,7 +1432,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; -- cgit v1.2.3