Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / gpio / gpio-tb10x.c

diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c
index a2bde95f64c7b88e1b9690535cf7b12474ba80ce..62ab9f4b2cd363c7a955eb609e442dba1d3661ac 100644 (file)
--- a/drivers/gpio/gpio-tb10x.c
+++ b/drivers/gpio/gpio-tb10x.c
@@ -195,18 +195,13 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
        if (of_property_read_u32(dn, "abilis,ngpio", &ngpio))
                return -EINVAL;
 
-       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!mem) {
-               dev_err(&pdev->dev, "No memory resource defined.\n");
-               return -EINVAL;
-       }
-
        tb10x_gpio = devm_kzalloc(&pdev->dev, sizeof(*tb10x_gpio), GFP_KERNEL);
        if (tb10x_gpio == NULL)
                return -ENOMEM;
 
        spin_lock_init(&tb10x_gpio->spinlock);
 
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        tb10x_gpio->base = devm_ioremap_resource(&pdev->dev, mem);
        if (IS_ERR(tb10x_gpio->base))
                return PTR_ERR(tb10x_gpio->base);