Merge remote-tracking branch 'asoc/topic/core' into asoc-next

[sfrench/cifs-2.6.git] / drivers / gpio / gpio-mxc.c

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 3abea3f0b307e143848686dd935ee0745a414eec..92692251ade1a13b7c2df99f97598584c3c05081 100644 (file)
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -424,6 +424,9 @@ static int mxc_gpio_probe(struct platform_device *pdev)
                return PTR_ERR(port->base);
 
        port->irq_high = platform_get_irq(pdev, 1);
+       if (port->irq_high < 0)
+               port->irq_high = 0;
+
        port->irq = platform_get_irq(pdev, 0);
        if (port->irq < 0)
                return port->irq;