From: NeilBrown Date: Thu, 30 Jul 2015 00:11:24 +0000 (+1000) Subject: twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node X-Git-Tag: Ubuntu-5.13.0-19.19~17393^2~14 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3fc3895e4fe17ee92ae1d1bb9f04da6069e8c370;p=mirror_ubuntu-jammy-kernel.git 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 Signed-off-by: Sebastian Reichel --- 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. */