Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / drivers / ata / sata_rcar.c

diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index 8108eb0654448f8eba16da40e4aace400ff8087a..c2d95e9fb971e611135ee19f81b3531eb36a597b 100644 (file)
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -778,10 +778,6 @@ static int sata_rcar_probe(struct platform_device *pdev)
        int irq;
        int ret = 0;
 
-       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (mem == NULL)
-               return -EINVAL;
-
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0)
                return -EINVAL;
@@ -807,6 +803,7 @@ static int sata_rcar_probe(struct platform_device *pdev)
 
        host->private_data = priv;
 
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        priv->base = devm_ioremap_resource(&pdev->dev, mem);
        if (IS_ERR(priv->base)) {
                ret = PTR_ERR(priv->base);