From: Viresh Kumar Date: Thu, 4 Sep 2014 12:01:23 +0000 (+0530) Subject: power-supply: Return early if "power-supplies" property isn't valid X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9c85486c4ae8fd56770340bd9c16a61127c96e1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git power-supply: Return early if "power-supplies" property isn't valid If power-supply's DT node doesn't have a valid "power-supplies" entry, then power_supply_check_supplies() should return early instead of trying to allocate memory for "supplied_from" array. Signed-off-by: Viresh Kumar Signed-off-by: Sebastian Reichel --- diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 10f0b57f00d9..414384a4ab52 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -226,6 +226,10 @@ static int power_supply_check_supplies(struct power_supply *psy) of_node_put(np); } while (np); + /* Missing valid "power-supplies" entries */ + if (cnt == 1) + return 0; + /* All supplies found, allocate char ** array for filling */ psy->supplied_from = devm_kzalloc(psy->dev, sizeof(psy->supplied_from), GFP_KERNEL);