Skip to content

L
linux
Commit e3d5b2f5 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'regulator/fix/s5m8767' into tmp

parents 3ab91da2 3ef30398
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/regulator/s5m8767.c
View file @ e3d5b2f5
...@@ -214,7 +214,7 @@ static int s5m8767_reg_is_enabled(struct regulator_dev *rdev) ...@@ -214,7 +214,7 @@ static int s5m8767_reg_is_enabled(struct regulator_dev *rdev)
struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
int ret, reg; int ret, reg;
int mask = 0xc0, enable_ctrl; int mask = 0xc0, enable_ctrl;
u8 val; unsigned int val;
ret = s5m8767_get_register(rdev, &reg, &enable_ctrl); ret = s5m8767_get_register(rdev, &reg, &enable_ctrl);
if (ret == -EINVAL) if (ret == -EINVAL)
...@@ -306,7 +306,7 @@ static int s5m8767_get_voltage_sel(struct regulator_dev *rdev) ...@@ -306,7 +306,7 @@ static int s5m8767_get_voltage_sel(struct regulator_dev *rdev)
struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
int reg, mask, ret; int reg, mask, ret;
int reg_id = rdev_get_id(rdev); int reg_id = rdev_get_id(rdev);
u8 val; unsigned int val;
ret = s5m8767_get_voltage_register(rdev, &reg); ret = s5m8767_get_voltage_register(rdev, &reg);
if (ret) if (ret)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7