summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2014-09-04 17:31:29 +0530
committerSebastian Reichel <sre@kernel.org>2014-09-16 11:01:32 +0200
commitf5b89affe2b2e6a6092f4228baf08a6dd59bfc61 (patch)
treed7a7f97f5f73f5540bfcfae36c375048c71d3c1e /drivers
parent8468b029a2871b1f0e372a9354bddeac6b03af3b (diff)
downloadop-kernel-dev-f5b89affe2b2e6a6092f4228baf08a6dd59bfc61.zip
op-kernel-dev-f5b89affe2b2e6a6092f4228baf08a6dd59bfc61.tar.gz
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 <viresh.kumar@linaro.org> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/power_supply_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 8a86cd1..ab1cf8b 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);
OpenPOWER on IntegriCloud