Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757544Ab3DPP3U (ORCPT ); Tue, 16 Apr 2013 11:29:20 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:40455 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752876Ab3DPP3T (ORCPT ); Tue, 16 Apr 2013 11:29:19 -0400 Message-ID: <1366126152.14735.2.camel@phoenix> Subject: [PATCH v2 1/2] regulator: ab8500-ext: Don't update info->update_val if set_mode() fails From: Axel Lin To: Mark Brown Cc: Bengt Jonsson , Lee Jones , Yvan FILLION , Liam Girdwood , linux-kernel@vger.kernel.org Date: Tue, 16 Apr 2013 23:29:12 +0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.6.2-0ubuntu0.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2391 Lines: 79 This ensures info->update_val status is still correct if set_mode() call fails. Otherwise, get_mode() may return wrong status if a set_mode() call fails. Signed-off-by: Axel Lin --- drivers/regulator/ab8500-ext.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c index 20680f3..03faf9c 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -181,6 +181,7 @@ static int ab8500_ext_regulator_set_mode(struct regulator_dev *rdev, { int ret = 0; struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev); + u8 regval; if (info == NULL) { dev_err(rdev_get_dev(rdev), "regulator info null pointer\n"); @@ -189,23 +190,30 @@ static int ab8500_ext_regulator_set_mode(struct regulator_dev *rdev, switch (mode) { case REGULATOR_MODE_NORMAL: - info->update_val = info->update_val_hp; + regval = info->update_val_hp; break; case REGULATOR_MODE_IDLE: - info->update_val = info->update_val_lp; + regval = info->update_val_lp; break; default: return -EINVAL; } - if (ab8500_ext_regulator_is_enabled(rdev)) { - u8 regval; - - ret = enable(info, ®val); - if (ret < 0) + /* If regulator is enabled and info->cfg->hwreq is set, the regulator + must be on in high power, so we don't need to write the register with + the same value. + */ + if (ab8500_ext_regulator_is_enabled(rdev) && + !(info->cfg && info->cfg->hwreq)) { + ret = abx500_mask_and_set_register_interruptible(info->dev, + info->update_bank, info->update_reg, + info->update_mask, regval); + if (ret < 0) { dev_err(rdev_get_dev(rdev), "Could not set regulator mode.\n"); + return ret; + } dev_dbg(rdev_get_dev(rdev), "%s-set_mode (bank, reg, mask, value): " @@ -214,7 +222,9 @@ static int ab8500_ext_regulator_set_mode(struct regulator_dev *rdev, info->update_mask, regval); } - return ret; + info->update_val = regval; + + return 0; } static unsigned int ab8500_ext_regulator_get_mode(struct regulator_dev *rdev) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/