Revert "twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node"
authorSebastian Reichel <sre@kernel.org>
Thu, 10 Sep 2015 08:00:55 +0000 (10:00 +0200)
committerSebastian Reichel <sre@kernel.org>
Thu, 10 Sep 2015 20:04:07 +0000 (22:04 +0200)
Revert commit 3fc3895e4fe17ee92ae1d1bb9f04da6069e8c370, since
it introduced a boot failure on some OMAP platforms.

Reported-by: Kevin Hilman <khilman@kernel.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/twl4030_charger.c

index f4f2c1f76c326d9093c9d9ea7587dd189aed5182..54b0325362dba0b9674e785b7f496990c68c2060 100644 (file)
@@ -1057,13 +1057,9 @@ 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. */