Commit f9c85486 authored Sep 04, 2014 by Viresh Kumar Committed by Sebastian Reichel Sep 16, 2014

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 <viresh.kumar@linaro.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

parent 8f5a37cb

drivers/power/power_supply_core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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);

Admin message