Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

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

diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index f7d764de6fdab988bde6124a8a9cd8657a0ea0ff..6bb89715b63703a22a96419f88711d7dde665e49 100644 (file)
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -31,7 +31,6 @@
 
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/of.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
@@ -419,7 +418,7 @@ static int dsps_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;
 
        /* Returns zero if e.g. not clocked */
        rev = dsps_readl(reg_base, wrp->revision);
@@ -500,10 +499,9 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
        resources[0].end = resources[0].start + SZ_4 - 1;
        resources[0].flags = IORESOURCE_MEM;
 
-       glue->usb_ctrl[id] = devm_request_and_ioremap(&pdev->dev, resources);
-       if (glue->usb_ctrl[id] == NULL) {
-               dev_err(dev, "Failed to obtain usb_ctrl%d memory\n", id);
-               ret = -ENODEV;
+       glue->usb_ctrl[id] = devm_ioremap_resource(&pdev->dev, resources);
+       if (IS_ERR(glue->usb_ctrl[id])) {
+               ret = PTR_ERR(glue->usb_ctrl[id]);
                goto err0;
        }