|
@@ -534,32 +534,26 @@ static int dwc3_probe(struct platform_device *pdev)
|
|
|
|
|
|
if (IS_ERR(dwc->usb2_phy)) {
|
|
|
ret = PTR_ERR(dwc->usb2_phy);
|
|
|
-
|
|
|
- /*
|
|
|
- * if -ENXIO is returned, it means PHY layer wasn't
|
|
|
- * enabled, so it makes no sense to return -EPROBE_DEFER
|
|
|
- * in that case, since no PHY driver will ever probe.
|
|
|
- */
|
|
|
- if (ret == -ENXIO)
|
|
|
+ if (ret == -ENXIO || ret == -ENODEV) {
|
|
|
+ dwc->usb2_phy = NULL;
|
|
|
+ } else if (ret == -EPROBE_DEFER) {
|
|
|
return ret;
|
|
|
-
|
|
|
- dev_err(dev, "no usb2 phy configured\n");
|
|
|
- return -EPROBE_DEFER;
|
|
|
+ } else {
|
|
|
+ dev_err(dev, "no usb2 phy configured\n");
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (IS_ERR(dwc->usb3_phy)) {
|
|
|
ret = PTR_ERR(dwc->usb3_phy);
|
|
|
-
|
|
|
- /*
|
|
|
- * if -ENXIO is returned, it means PHY layer wasn't
|
|
|
- * enabled, so it makes no sense to return -EPROBE_DEFER
|
|
|
- * in that case, since no PHY driver will ever probe.
|
|
|
- */
|
|
|
- if (ret == -ENXIO)
|
|
|
+ if (ret == -ENXIO || ret == -ENODEV) {
|
|
|
+ dwc->usb3_phy = NULL;
|
|
|
+ } else if (ret == -EPROBE_DEFER) {
|
|
|
return ret;
|
|
|
-
|
|
|
- dev_err(dev, "no usb3 phy configured\n");
|
|
|
- return -EPROBE_DEFER;
|
|
|
+ } else {
|
|
|
+ dev_err(dev, "no usb3 phy configured\n");
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
dwc->xhci_resources[0].start = res->start;
|