From caf48ab45af2981f018b551dddb961472445c68f Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 17 Jul 2012 00:10:42 +0800 Subject: [PATCH] --- yaml --- r: 321851 b: refs/heads/master c: 3e2a928472daa839e7be0d71c1d8320334ea76e1 h: refs/heads/master i: 321849: b76ec7ec1e51429c6c5df80b8545f518f9ff4859 321847: b5c01470d46baeb698498391df520418472b3446 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/anatop-regulator.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 75197ba7cf21..f8d30c7e7528 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f852e0584f67654060f7814149744a1b7250480 +refs/heads/master: 3e2a928472daa839e7be0d71c1d8320334ea76e1 diff --git a/trunk/drivers/regulator/anatop-regulator.c b/trunk/drivers/regulator/anatop-regulator.c index e9c2085f9dfb..ce0fe72a428e 100644 --- a/trunk/drivers/regulator/anatop-regulator.c +++ b/trunk/drivers/regulator/anatop-regulator.c @@ -64,14 +64,15 @@ static int anatop_set_voltage_sel(struct regulator_dev *reg, unsigned selector) static int anatop_get_voltage_sel(struct regulator_dev *reg) { struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); - u32 val; + u32 val, mask; if (!anatop_reg->control_reg) return -ENOTSUPP; val = anatop_read_reg(anatop_reg->mfd, anatop_reg->control_reg); - val = (val & ((1 << anatop_reg->vol_bit_width) - 1)) >> + mask = ((1 << anatop_reg->vol_bit_width) - 1) << anatop_reg->vol_bit_shift; + val = (val & mask) >> anatop_reg->vol_bit_shift; return val - anatop_reg->min_bit_val; }