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@brown.name>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
NeilBrown 2015-07-30 10:11:24 +10:00 committed by Sebastian Reichel
parent 7396f708b9
commit 3fc3895e4f

View File

@ -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. */