projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ce4eac
)
regulator: as3722: set the correct current limit
author
Vince Hsu
<vinceh@nvidia.com>
Thu, 28 Nov 2013 11:10:42 +0000
(19:10 +0800)
committer
Mark Brown
<broonie@linaro.org>
Mon, 2 Dec 2013 18:02:34 +0000
(18:02 +0000)
Simple fix to set the correct current limit for SD0/1/6.
Signed-off-by: Vince Hsu <vinceh@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Fixes:
bc407334e9a6
(regulator: as3722: add regulator driver for AMS AS3722)
Cc: stable@vger.kernel.org
drivers/regulator/as3722-regulator.c
patch
|
blob
|
history
diff --git
a/drivers/regulator/as3722-regulator.c
b/drivers/regulator/as3722-regulator.c
index
5917fe3
..
b9f1d24
100644
(file)
--- a/
drivers/regulator/as3722-regulator.c
+++ b/
drivers/regulator/as3722-regulator.c
@@
-590,8
+590,8
@@
static int as3722_sd016_set_current_limit(struct regulator_dev *rdev,
default:
return -EINVAL;
}
+ ret <<= ffs(mask) - 1;
val = ret & mask;
- val <<= ffs(mask) - 1;
return as3722_update_bits(as3722, reg, mask, val);
}