aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/amba
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-18 06:31:51 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-25 06:02:02 -0500
commit023f117c547719fbc087ad72276aec5a026370df (patch)
tree068c4cec712bbf881153505aaf7c194859cfc79d /drivers/amba
parent039e7ad89211a63d98341e4add4fc6720f383c2a (diff)
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')
-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 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)
564 if (ret) 564 if (ret)
565 goto err_release; 565 goto err_release;
566 566
567 if (dev->irq[0] != NO_IRQ) 567 if (dev->irq[0] && dev->irq[0] != NO_IRQ)
568 ret = device_create_file(&dev->dev, &dev_attr_irq0); 568 ret = device_create_file(&dev->dev, &dev_attr_irq0);
569 if (ret == 0 && dev->irq[1] != NO_IRQ) 569 if (ret == 0 && dev->irq[1] && dev->irq[1] != NO_IRQ)
570 ret = device_create_file(&dev->dev, &dev_attr_irq1); 570 ret = device_create_file(&dev->dev, &dev_attr_irq1);
571 if (ret == 0) 571 if (ret == 0)
572 return ret; 572 return ret;