diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:31 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:31 -0400 |
| commit | 2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f (patch) | |
| tree | 0d8fa03787d335f959ee769f0d1d5b8e9fd35923 | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
| parent | 9a633a2bced158c57b73cf4d8e87be60473de1d2 (diff) | |
Merge remote-tracking branch 'regulator/fix/ti-abb' into regulator-linus
| -rw-r--r-- | drivers/regulator/ti-abb-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c index 20c271d49dcb..b993ec570f66 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, | |||
| 615 | pname, *volt_table, vset_mask); | 615 | pname, *volt_table, vset_mask); |
| 616 | continue; | 616 | continue; |
| 617 | } | 617 | } |
| 618 | info->vset = efuse_val & vset_mask >> __ffs(vset_mask); | 618 | info->vset = (efuse_val & vset_mask) >> __ffs(vset_mask); |
| 619 | dev_dbg(dev, "[%d]v=%d vset=%x\n", i, *volt_table, info->vset); | 619 | dev_dbg(dev, "[%d]v=%d vset=%x\n", i, *volt_table, info->vset); |
| 620 | check_abb: | 620 | check_abb: |
| 621 | switch (info->opp_sel) { | 621 | switch (info->opp_sel) { |