From 773ab3194ccddbd3443335ac22df528ae2950391 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 9 May 2011 11:41:02 +0200 Subject: [PATCH] --- yaml --- r: 252154 b: refs/heads/master c: 82d158397b6eeb464263a6ef6a739c4118a34720 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0e0c056e103f..3fc59b4a517e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ce8a2a05f249054e6bce109a15ee188b4124256 +refs/heads/master: 82d158397b6eeb464263a6ef6a739c4118a34720 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index a2728a498c3f..98d25fcb3930 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -1504,13 +1504,14 @@ static int _regulator_force_disable(struct regulator_dev *rdev, */ int regulator_force_disable(struct regulator *regulator) { + struct regulator_dev *rdev = regulator->rdev; struct regulator_dev *supply_rdev = NULL; int ret; - mutex_lock(®ulator->rdev->mutex); + mutex_lock(&rdev->mutex); regulator->uA_load = 0; - ret = _regulator_force_disable(regulator->rdev, &supply_rdev); - mutex_unlock(®ulator->rdev->mutex); + ret = _regulator_force_disable(rdev, &supply_rdev); + mutex_unlock(&rdev->mutex); if (supply_rdev) regulator_disable(get_device_regulator(rdev_get_dev(supply_rdev)));