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

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc3 / dwc3-keystone.c

diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c
index 7ec8495f45234841efc823871eaf1f29de25219e..fe3b9335a74e1d279da69b73e80897ca2a70d5f0 100644 (file)
--- a/drivers/usb/dwc3/dwc3-keystone.c
+++ b/drivers/usb/dwc3/dwc3-keystone.c
@@ -104,11 +104,6 @@ static int kdwc3_probe(struct platform_device *pdev)
        kdwc->dev = dev;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(dev, "missing usbss resource\n");
-               return -EINVAL;
-       }
-
        kdwc->usbss = devm_ioremap_resource(dev, res);
        if (IS_ERR(kdwc->usbss))
                return PTR_ERR(kdwc->usbss);
@@ -128,6 +123,7 @@ static int kdwc3_probe(struct platform_device *pdev)
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
                dev_err(&pdev->dev, "missing irq\n");
+               error = irq;
                goto err_irq;
        }