Merge tag 'arc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[karo-tx-linux.git] / drivers / gpio / gpio-generic.c

diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index d8b1700b95194454e47e0cb69b0a1b31ad2c0bd2..bd5193c67a9c272cb0bebf779ce3277d22aac479 100644 (file)
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -586,7 +586,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev,
 
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
        if (!r)
-               return IOMEM_ERR_PTR(-EINVAL);
+               return NULL;
 
        sz = resource_size(r);
        if (sz != sane_sz)