diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-14 19:38:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-14 19:38:59 -0500 |
| commit | e3d5b2f5707b623c9bb5dbff1a02c8b0d48a44b4 (patch) | |
| tree | 55f653aa97f34893611bde009a754a4500651a03 | |
| parent | 3ab91da2f14c02330a1ebe2a17a0f5ba1e5096ca (diff) | |
| parent | 3ef303988cfcb35922f550892cf476e861377f0b (diff) | |
Merge remote-tracking branch 'regulator/fix/s5m8767' into tmp
| -rw-r--r-- | drivers/regulator/s5m8767.c | 4 |
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) | |||
| 214 | struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); | 214 | struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); |
| 215 | int ret, reg; | 215 | int ret, reg; |
| 216 | int mask = 0xc0, enable_ctrl; | 216 | int mask = 0xc0, enable_ctrl; |
| 217 | u8 val; | 217 | unsigned int val; |
| 218 | 218 | ||
| 219 | ret = s5m8767_get_register(rdev, ®, &enable_ctrl); | 219 | ret = s5m8767_get_register(rdev, ®, &enable_ctrl); |
| 220 | if (ret == -EINVAL) | 220 | if (ret == -EINVAL) |
| @@ -306,7 +306,7 @@ static int s5m8767_get_voltage_sel(struct regulator_dev *rdev) | |||
| 306 | struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); | 306 | struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); |
| 307 | int reg, mask, ret; | 307 | int reg, mask, ret; |
| 308 | int reg_id = rdev_get_id(rdev); | 308 | int reg_id = rdev_get_id(rdev); |
| 309 | u8 val; | 309 | unsigned int val; |
| 310 | 310 | ||
| 311 | ret = s5m8767_get_voltage_register(rdev, ®); | 311 | ret = s5m8767_get_voltage_register(rdev, ®); |
| 312 | if (ret) | 312 | if (ret) |