Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / usb / musb / am35x.c

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index c107d7cdfa6962049f7af975ef4281e2a90c98ef..59eea219034a0252420b1f2248d80d33753fa9b5 100644 (file)
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -365,7 +365,7 @@ static int am35x_musb_init(struct musb *musb)
        usb_nop_xceiv_register();
        musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
        if (IS_ERR_OR_NULL(musb->xceiv))
-               return -ENODEV;
+               return -EPROBE_DEFER;
 
        setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);