evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

power_supply: Fix unbalanced the power supplies

Browse source 
If a driver invokes multiple power_supply_register(), the each supply
will not be saved in the supplied_from[] with the correct index.

supplied_from[0] = "dc"
num_supplies = 1;

supplied_from[0] = "usb"
num_supplies = 2;

supplied_from[0] = "battery"
num_supplies = 3;
...

It results in NPE when iterating the supplied_from[] with num_supplies on
__power_supply_is_supplied_by()

Bug: 63785418
Change-Id: Ifd14ca7c6e2df247e1090e4fa8d8c66bd2912180
Signed-off-by; Devin Kim <dojip.kim@lge.com>
Signed-off-by: Steve Pfetsch <spfetsch@google.com>
This commit is contained in:
jonghyun26.kim 2017-07-24 15:39:48 -07:00 • committed by Timi
parent 91730df4a8
commit 927bce4ae9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/power/power_supply_core.c
View file

@ -166,8 +166,8 @@ static int __power_supply_populate_supplied_from(struct device *dev,
if (np == epsy->of_node) { if (np == epsy->of_node) {
dev_info(&psy->dev, "%s: Found supply : %s\n", dev_info(&psy->dev, "%s: Found supply : %s\n",
psy->desc->name, epsy->desc->name); psy->desc->name, epsy->desc->name);
psy->supplied_from[i-1] = (char *)epsy->desc->name; psy->supplied_from[psy->num_supplies++] =
psy->num_supplies++; (char *)epsy->desc->name;
of_node_put(np); of_node_put(np);
break; break;
} }