summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/pbias-regulator.c
diff options
context:
space:
mode:
authorAxel Lin2014-03-08 04:55:29 +0100
committerMark Brown2014-04-14 23:16:25 +0200
commit1cb7b43f6796ad0bc62669fa52d1005916911d27 (patch)
tree19b84eaaf562c396fca70ef1a9a27a4443d6c877 /drivers/regulator/pbias-regulator.c
parentLinux 3.15-rc1 (diff)
downloadkernel-qcow2-linux-1cb7b43f6796ad0bc62669fa52d1005916911d27.tar.gz
kernel-qcow2-linux-1cb7b43f6796ad0bc62669fa52d1005916911d27.tar.xz
kernel-qcow2-linux-1cb7b43f6796ad0bc62669fa52d1005916911d27.zip
regulator: pbias: Fix is_enabled callback implementation
The is_enabled implementation is wrong in some cases: e.g. for pbias_mmc_omap5: enable_mask is : BIT(27) | BIT(25) | BIT(26) However, pbias_regulator_enable() only sets BIT(27) | BIT(26) bits. So is_enabled callback will always return false in this case. Fix the logic to compare the register value with info->enable rather than info->enable_mask. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Balaji T K <balajitk@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/pbias-regulator.c')
-rw-r--r--drivers/regulator/pbias-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/pbias-regulator.c b/drivers/regulator/pbias-regulator.c
index ded3b3574209..d89a1d8615c7 100644
--- a/drivers/regulator/pbias-regulator.c
+++ b/drivers/regulator/pbias-regulator.c
@@ -108,7 +108,7 @@ static int pbias_regulator_is_enable(struct regulator_dev *rdev)
regmap_read(data->syscon, data->pbias_reg, &value);
- return (value & info->enable_mask) == info->enable_mask;
+ return (value & info->enable_mask) == info->enable;
}
static struct regulator_ops pbias_regulator_voltage_ops = {