diff options
author | Sebastian Reichel <sre@kernel.org> | 2015-09-10 04:00:55 -0400 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2015-09-10 16:04:07 -0400 |
commit | aefc574bbbbe74bb891ba392d98f2d59a417c774 (patch) | |
tree | e56a04e6e7737cb009e622ae31dbb058e19d3d72 | |
parent | b8889c4fc6ba03e289cec6a4d692f6f080a55e53 (diff) |
Revert "twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node"
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>
-rw-r--r-- | drivers/power/twl4030_charger.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index f4f2c1f76c32..54b0325362db 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c | |||
@@ -1057,13 +1057,9 @@ static int twl4030_bci_probe(struct platform_device *pdev) | |||
1057 | 1057 | ||
1058 | phynode = of_find_compatible_node(bci->dev->of_node->parent, | 1058 | phynode = of_find_compatible_node(bci->dev->of_node->parent, |
1059 | NULL, "ti,twl4030-usb"); | 1059 | NULL, "ti,twl4030-usb"); |
1060 | if (phynode) { | 1060 | if (phynode) |
1061 | bci->transceiver = devm_usb_get_phy_by_node( | 1061 | bci->transceiver = devm_usb_get_phy_by_node( |
1062 | bci->dev, phynode, &bci->usb_nb); | 1062 | bci->dev, phynode, &bci->usb_nb); |
1063 | if (IS_ERR(bci->transceiver) && | ||
1064 | PTR_ERR(bci->transceiver) == -EPROBE_DEFER) | ||
1065 | return -EPROBE_DEFER; | ||
1066 | } | ||
1067 | } | 1063 | } |
1068 | 1064 | ||
1069 | /* Enable interrupts now. */ | 1065 | /* Enable interrupts now. */ |