From f5b89affe2b2e6a6092f4228baf08a6dd59bfc61 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Thu, 4 Sep 2014 17:31:29 +0530 Subject: power-supply: Propagate error returned by power_supply_find_supply_from_node() Callers of power_supply_find_supply_from_node(), i.e. power_supply_check_supplies(), must propagate the errors returned by it instead of returning their own. Signed-off-by: Viresh Kumar Signed-off-by: Sebastian Reichel --- drivers/power/power_supply_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/power') diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 8a86cd138de8..ab1cf8bcbefb 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -221,8 +221,8 @@ static int power_supply_check_supplies(struct power_supply *psy) of_node_put(np); if (ret) { - dev_dbg(psy->dev, "Failed to find supply, defer!\n"); - return -EPROBE_DEFER; + dev_dbg(psy->dev, "Failed to find supply!\n"); + return ret; } } while (np); -- cgit v1.2.3