Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regulator-fix-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"Two small fixes for the regulator subsystem - one fixing a crash with
one of the devices supported by the max77620 driver, another fixing
startup for the anatop regulator when it starts up with the regulator
in bypass mode"
* tag 'regulator-fix-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: max77620: check for valid regulator info
regulator: anatop: allow regulator to be in bypass mode
+7
-2
+1
-1
drivers/regulator/anatop-regulator.c
+1
-1
drivers/regulator/anatop-regulator.c
+6
-1
drivers/regulator/max77620-regulator.c
+6
-1
drivers/regulator/max77620-regulator.c
···
123
123
unsigned int val;
124
124
int ret;
125
125
126
+
if (!rinfo)
127
+
return 0;
128
+
126
129
switch (fps_src) {
127
130
case MAX77620_FPS_SRC_0:
128
131
case MAX77620_FPS_SRC_1:
···
173
170
int pu = rpdata->active_fps_pu_slot;
174
171
int pd = rpdata->active_fps_pd_slot;
175
172
int ret = 0;
173
+
174
+
if (!rinfo)
175
+
return 0;
176
176
177
177
if (is_suspend) {
178
178
pu = rpdata->suspend_fps_pu_slot;
···
686
680
RAIL_SD(SD1, sd1, "in-sd1", SD1, 600000, 1550000, 12500, 0x22, SD1),
687
681
RAIL_SD(SD2, sd2, "in-sd2", SDX, 600000, 3787500, 12500, 0xFF, NONE),
688
682
RAIL_SD(SD3, sd3, "in-sd3", SDX, 600000, 3787500, 12500, 0xFF, NONE),
689
-
RAIL_SD(SD4, sd4, "in-sd4", SDX, 600000, 3787500, 12500, 0xFF, NONE),
690
683
691
684
RAIL_LDO(LDO0, ldo0, "in-ldo0-1", N, 800000, 2375000, 25000),
692
685
RAIL_LDO(LDO1, ldo1, "in-ldo0-1", N, 800000, 2375000, 25000),