ARM: amba: make irq 0 invalid

Fix core bus and MMCI such that irq 0 means that there is no IRQ
attached.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 82b65e1e12bf..d15acbb4d59e 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -564,9 +564,9 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
         if (ret)
                 goto err_release;
 
-        if (dev->irq[0] != NO_IRQ)
+        if (dev->irq[0] && dev->irq[0] != NO_IRQ)
                 ret = device_create_file(&dev->dev, &dev_attr_irq0);
-        if (ret == 0 && dev->irq[1] != NO_IRQ)
+        if (ret == 0 && dev->irq[1] && dev->irq[1] != NO_IRQ)
                 ret = device_create_file(&dev->dev, &dev_attr_irq1);
         if (ret == 0)
                 return ret;
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 0d955ffaf44e..304f2f98b680 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1325,7 +1325,7 @@ static int __devinit mmci_probe(struct amba_device *dev,
         if (ret)
                 goto unmap;
 
-        if (dev->irq[1] == NO_IRQ)
+        if (dev->irq[1] == NO_IRQ || !dev->irq[1])
                 host->singleirq = true;
         else {
                 ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED,