From d48f2f600821e1d94f1a5026d6182374735f8153 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Sun, 18 Sep 2011 16:54:50 +0200 Subject: [PATCH RESEND] 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 Acked-by: Mark Brown --- no changes, except adding the ack from Mark Brown and including the relevant (and forgotten in the first try) LKML drivers/regulator/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 026f3d4..c9dd19c 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; -- 1.7.2.3