forked from luck/tmp_suning_uos_patched
USB: ehci-omap: Improve PHY error handling
As the USB PHY layer never returns NULL we don't need to check for that condition. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7c4ebe68ec
commit
2bef64b89a
|
@ -175,12 +175,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
|
|||
phy = devm_usb_get_phy_by_phandle(dev, "phys", i);
|
||||
else
|
||||
phy = devm_usb_get_phy_dev(dev, i);
|
||||
if (IS_ERR(phy) || !phy) {
|
||||
if (IS_ERR(phy)) {
|
||||
/* Don't bail out if PHY is not absolutely necessary */
|
||||
if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY)
|
||||
continue;
|
||||
|
||||
ret = IS_ERR(phy) ? PTR_ERR(phy) : -ENODEV;
|
||||
ret = PTR_ERR(phy);
|
||||
dev_err(dev, "Can't get PHY device for port %d: %d\n",
|
||||
i, ret);
|
||||
goto err_phy;
|
||||
|
|
Loading…
Reference in New Issue
Block a user