aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-15 09:38:59 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-15 09:38:59 +0900
commite3d5b2f5707b623c9bb5dbff1a02c8b0d48a44b4 (patch)
tree55f653aa97f34893611bde009a754a4500651a03
parent3ab91da2f14c02330a1ebe2a17a0f5ba1e5096ca (diff)
parent3ef303988cfcb35922f550892cf476e861377f0b (diff)
downloadlinux-stericsson-e3d5b2f5707b623c9bb5dbff1a02c8b0d48a44b4.tar.gz
Merge remote-tracking branch 'regulator/fix/s5m8767' into tmp
-rw-r--r--drivers/regulator/s5m8767.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 9f991f2c525a..33b65c9ad5d5 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -214,7 +214,7 @@ static int s5m8767_reg_is_enabled(struct regulator_dev *rdev)
struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
int ret, reg;
int mask = 0xc0, enable_ctrl;
- u8 val;
+ unsigned int val;
ret = s5m8767_get_register(rdev, &reg, &enable_ctrl);
if (ret == -EINVAL)
@@ -306,7 +306,7 @@ static int s5m8767_get_voltage_sel(struct regulator_dev *rdev)
struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
int reg, mask, ret;
int reg_id = rdev_get_id(rdev);
- u8 val;
+ unsigned int val;
ret = s5m8767_get_voltage_register(rdev, &reg);
if (ret)