diff options
| author | Sebastian Reichel <sre@kernel.org> | 2015-09-10 10:00:55 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-09-10 22:04:07 +0200 |
| commit | aefc574bbbbe74bb891ba392d98f2d59a417c774 (patch) | |
| tree | e56a04e6e7737cb009e622ae31dbb058e19d3d72 /drivers | |
| parent | Merge tag 'tty-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| download | linux-aefc574bbbbe74bb891ba392d98f2d59a417c774.tar.xz linux-aefc574bbbbe74bb891ba392d98f2d59a417c774.zip | |
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>
Diffstat (limited to 'drivers')
| -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) 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. */ |