summaryrefslogtreecommitdiff
path: root/drivers/amba/bus.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-18 11:31:51 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-25 11:02:02 +0000
commit023f117c547719fbc087ad72276aec5a026370df (patch)
tree068c4cec712bbf881153505aaf7c194859cfc79d /drivers/amba/bus.c
parent039e7ad89211a63d98341e4add4fc6720f383c2a (diff)
downloadlinux-3.10-023f117c547719fbc087ad72276aec5a026370df.tar.gz
linux-3.10-023f117c547719fbc087ad72276aec5a026370df.tar.bz2
linux-3.10-023f117c547719fbc087ad72276aec5a026370df.zip
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>
Diffstat (limited to 'drivers/amba/bus.c')
-rw-r--r--drivers/amba/bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 82b65e1e12b..d15acbb4d59 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;