From 33e1990372af74741e671e6d3e7cd492a7bc1d41 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 18 Dec 2011 11:31:51 +0000 Subject: [PATCH] --- yaml --- r: 295345 b: refs/heads/master c: 023f117c547719fbc087ad72276aec5a026370df h: refs/heads/master i: 295343: 2653c57a69805ec579d4aa2c25560b6b18c9ed98 v: v3 --- [refs] | 2 +- trunk/drivers/amba/bus.c | 4 ++-- trunk/drivers/mmc/host/mmci.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fc883680f17c..ccd24513a667 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 039e7ad89211a63d98341e4add4fc6720f383c2a +refs/heads/master: 023f117c547719fbc087ad72276aec5a026370df diff --git a/trunk/drivers/amba/bus.c b/trunk/drivers/amba/bus.c index 82b65e1e12bf..d15acbb4d59e 100644 --- a/trunk/drivers/amba/bus.c +++ b/trunk/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/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c index 0d955ffaf44e..304f2f98b680 100644 --- a/trunk/drivers/mmc/host/mmci.c +++ b/trunk/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,