[02/15] power-supply: Return early if "power-supplies" property isn't valid

Message ID ef5d24a5fcdc5b442374ae148d0c640411bdccd9.1409831636.git.viresh.kumar@linaro.org
State Accepted
Commit f9c85486c4ae8fd56770340bd9c16a61127c96e1
Headers show

Commit Message

Viresh Kumar Sept. 4, 2014, 12:01 p.m.
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>
---
 drivers/power/power_supply_core.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 10f0b57..414384a 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);