usb: dwc2: Return errors from PHY
When searching for PHYs, any error was treated as if the PHY did not exist or was not specified. Thus the probe function did not correctly return error conditions such as -EPROBE_DEFER. Fixed so that only a non-existing PHY is ignored and any other error is returned. Acked-by: Eric Anholt <eric@anholt.net> Reported-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: John Youn <johnyoun@synopsys.com> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Родитель
d0464bcf12
Коммит
6c2dad6916
|
@ -212,14 +212,41 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)
|
|||
*/
|
||||
hsotg->phy = devm_phy_get(hsotg->dev, "usb2-phy");
|
||||
if (IS_ERR(hsotg->phy)) {
|
||||
hsotg->phy = NULL;
|
||||
hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2);
|
||||
if (IS_ERR(hsotg->uphy))
|
||||
hsotg->uphy = NULL;
|
||||
else
|
||||
hsotg->plat = dev_get_platdata(hsotg->dev);
|
||||
ret = PTR_ERR(hsotg->phy);
|
||||
switch (ret) {
|
||||
case -ENODEV:
|
||||
case -ENOSYS:
|
||||
hsotg->phy = NULL;
|
||||
break;
|
||||
case -EPROBE_DEFER:
|
||||
return ret;
|
||||
default:
|
||||
dev_err(hsotg->dev, "error getting phy %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
if (!hsotg->phy) {
|
||||
hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2);
|
||||
if (IS_ERR(hsotg->uphy)) {
|
||||
ret = PTR_ERR(hsotg->uphy);
|
||||
switch (ret) {
|
||||
case -ENODEV:
|
||||
case -ENXIO:
|
||||
hsotg->uphy = NULL;
|
||||
break;
|
||||
case -EPROBE_DEFER:
|
||||
return ret;
|
||||
default:
|
||||
dev_err(hsotg->dev, "error getting usb phy %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
hsotg->plat = dev_get_platdata(hsotg->dev);
|
||||
|
||||
if (hsotg->phy) {
|
||||
/*
|
||||
* If using the generic PHY framework, check if the PHY bus
|
||||
|
|
Загрузка…
Ссылка в новой задаче