summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:31 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:31 +0100
commit2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f (patch)
tree0d8fa03787d335f959ee769f0d1d5b8e9fd35923
parent31d141e3a666269a3b6fcccddb0351caf7454240 (diff)
parent9a633a2bced158c57b73cf4d8e87be60473de1d2 (diff)
downloadop-kernel-dev-2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f.zip
op-kernel-dev-2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f.tar.gz
Merge remote-tracking branch 'regulator/fix/ti-abb' into regulator-linus
-rw-r--r--drivers/regulator/ti-abb-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c
index 20c271d..b993ec5 100644
--- a/drivers/regulator/ti-abb-regulator.c
+++ b/drivers/regulator/ti-abb-regulator.c
@@ -615,7 +615,7 @@ static int ti_abb_init_table(struct device *dev, struct ti_abb *abb,
pname, *volt_table, vset_mask);
continue;
}
- info->vset = efuse_val & vset_mask >> __ffs(vset_mask);
+ info->vset = (efuse_val & vset_mask) >> __ffs(vset_mask);
dev_dbg(dev, "[%d]v=%d vset=%x\n", i, *volt_table, info->vset);
check_abb:
switch (info->opp_sel) {
OpenPOWER on IntegriCloud