tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Mark Brown e3d5b2f5 3ab91da2

+2 -2
+2 -2
drivers/regulator/s5m8767.c
··· 214 214 struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); 215 215 int ret, reg; 216 216 int mask = 0xc0, enable_ctrl; 217 - u8 val; 217 + unsigned int val; 218 218 219 219 ret = s5m8767_get_register(rdev, &reg, &enable_ctrl); 220 220 if (ret == -EINVAL) ··· 306 306 struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); 307 307 int reg, mask, ret; 308 308 int reg_id = rdev_get_id(rdev); 309 - u8 val; 309 + unsigned int val; 310 310 311 311 ret = s5m8767_get_voltage_register(rdev, &reg); 312 312 if (ret)