From 5ded05eba27ad2d305e4fecc022d005b65402922 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 24 Apr 2013 11:51:12 +0800 Subject: [PATCH] --- yaml --- r: 365020 b: refs/heads/master c: 78040b630f28298e0ecb56bf1bc53c7976314eab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/mc13892-regulator.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eacbd5e2941e..6ce6f3cfc9c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86b139f0f3441dfcb32a095cdc2ffe88c13c8ed0 +refs/heads/master: 78040b630f28298e0ecb56bf1bc53c7976314eab diff --git a/trunk/drivers/regulator/mc13892-regulator.c b/trunk/drivers/regulator/mc13892-regulator.c index 364ddd1c8591..b8d35ec598ea 100644 --- a/trunk/drivers/regulator/mc13892-regulator.c +++ b/trunk/drivers/regulator/mc13892-regulator.c @@ -465,13 +465,13 @@ static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev, */ if (mc13892_regulators[id].vsel_reg != MC13892_SWITCHERS0) { + mask |= MC13892_SWITCHERS0_SWxHI; + if (volt > 1375000) { reg_value -= MC13892_SWxHI_SEL_OFFSET; reg_value |= MC13892_SWITCHERS0_SWxHI; - mask |= MC13892_SWITCHERS0_SWxHI; - } else if (volt < 1100000) { + } else { reg_value &= ~MC13892_SWITCHERS0_SWxHI; - mask |= MC13892_SWITCHERS0_SWxHI; } }