Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-mxc.c

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 3307f6db3a925fb3469c29f34eb69bfb93ca312a..db83b3c0a44959f47851d3705fe7bb5b337a8577 100644 (file)
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -422,7 +422,7 @@ static int mxc_gpio_probe(struct platform_device *pdev)
        port->irq_high = platform_get_irq(pdev, 1);
        port->irq = platform_get_irq(pdev, 0);
        if (port->irq < 0)
-               return -EINVAL;
+               return port->irq;
 
        /* disable the interrupt and clear the status */
        writel(0, port->base + GPIO_IMR);