From 5a92a86c866b1e6ad9ee9cdc7f9b312a0943c2ff Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 26 Mar 2013 16:13:14 +0800 Subject: [PATCH] --- yaml --- r: 365036 b: refs/heads/master c: f71bf52808e7089a5a6df9b32ffa13e93e51f1ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/ab8500.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a78e6ecc3789..6cfe536c6f64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5689e830745b39dbab895e5e8df3f962cb7eecac +refs/heads/master: f71bf52808e7089a5a6df9b32ffa13e93e51f1ca diff --git a/trunk/drivers/regulator/ab8500.c b/trunk/drivers/regulator/ab8500.c index 12e274039ae1..4a70323377d3 100644 --- a/trunk/drivers/regulator/ab8500.c +++ b/trunk/drivers/regulator/ab8500.c @@ -117,9 +117,11 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev) ret = abx500_mask_and_set_register_interruptible(info->dev, info->update_bank, info->update_reg, info->update_mask, info->update_val); - if (ret < 0) + if (ret < 0) { dev_err(rdev_get_dev(rdev), "couldn't set enable bits for regulator\n"); + return ret; + } info->is_enabled = true; @@ -144,9 +146,11 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev) ret = abx500_mask_and_set_register_interruptible(info->dev, info->update_bank, info->update_reg, info->update_mask, 0x0); - if (ret < 0) + if (ret < 0) { dev_err(rdev_get_dev(rdev), "couldn't set disable bits for regulator\n"); + return ret; + } info->is_enabled = false;