Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
One small bug fix from Axel plus a fix for a build failure in unrealistic
but commonly built configs which for some reason manage to survive for
an awfully long time in -next without any reports.
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: Fix getting voltage in max8649_enable_time()
regulator: Fix mc13xxx regulator modular build (again)
+3
-1
+1
-1
drivers/regulator/max8649.c
+1
-1
drivers/regulator/max8649.c
···
150
150
if (ret != 0)
151
151
return ret;
152
152
val &= MAX8649_VOL_MASK;
153
-
voltage = max8649_list_voltage(rdev, (unsigned char)ret); /* uV */
153
+
voltage = max8649_list_voltage(rdev, (unsigned char)val); /* uV */
154
154
155
155
/* get rate */
156
156
ret = regmap_read(info->regmap, MAX8649_RAMP, &val);
+2
drivers/regulator/mc13xxx-regulator-core.c
+2
drivers/regulator/mc13xxx-regulator-core.c
···
254
254
255
255
return num;
256
256
}
257
+
EXPORT_SYMBOL_GPL(mc13xxx_get_num_regulators_dt);
257
258
258
259
struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt(
259
260
struct platform_device *pdev, struct mc13xxx_regulator *regulators,
···
292
291
293
292
return data;
294
293
}
294
+
EXPORT_SYMBOL_GPL(mc13xxx_parse_regulators_dt);
295
295
#endif
296
296
297
297
MODULE_LICENSE("GPL v2");