[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Thu, 30 Jul 2015 10:11:24 +1000
From: NeilBrown <neil@...wn.name>
To: Sebastian Reichel <sre@...nel.org>
Cc: Samuel Ortiz <sameo@...ux.intel.com>, linux-pm@...r.kernel.org,
Tony Lindgren <tony@...mide.com>,
David Woodhouse <dwmw2@...radead.org>,
linux-kernel@...r.kernel.org,
real GTA04 owners <gta04-owner@...delico.com>,
Dmitry Eremin-Solenikov <dbaryshkov@...il.com>,
Pavel Machek <pavel@....cz>, linux-omap@...r.kernel.org,
Lee Jones <lee.jones@...aro.org>
Subject: [PATCH 03/13] twl4030_charger: correctly handle -EPROBE_DEFER from
devm_usb_get_phy_by_node
Now that twl4030_bci_probe can safely return -EPROBE_DEFER,
do so when devm_usb_get_phy_by_node returns that error.
Signed-off-by: NeilBrown <neil@...wn.name>
---
drivers/power/twl4030_charger.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 045238370d3f..ffc123fb7158 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -636,9 +636,13 @@ static int twl4030_bci_probe(struct platform_device *pdev)
phynode = of_find_compatible_node(bci->dev->of_node->parent,
NULL, "ti,twl4030-usb");
- if (phynode)
+ if (phynode) {
bci->transceiver = devm_usb_get_phy_by_node(
bci->dev, phynode, &bci->usb_nb);
+ if (IS_ERR(bci->transceiver) &&
+ PTR_ERR(bci->transceiver) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ }
}
/* Enable interrupts now. */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists