From 994546ad166a8da6bad26a92fe520c71b927c837 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 18 Dec 2011 11:43:56 +0000
Subject: [PATCH] --- yaml --- r: 295356 b: refs/heads/master c:
 2eac58d5026e4ec8b17ff8b62877fea9e1d2f1b3 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/amba/bus.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b95056fbe318..a64bc135635b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bf96889976168827eade6788f26391de051e872
+refs/heads/master: 2eac58d5026e4ec8b17ff8b62877fea9e1d2f1b3
diff --git a/trunk/drivers/amba/bus.c b/trunk/drivers/amba/bus.c
index d15acbb4d59e..01c2cf4efcdd 100644
--- a/trunk/drivers/amba/bus.c
+++ b/trunk/drivers/amba/bus.c
@@ -511,6 +511,9 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
 	void __iomem *tmp;
 	int i, ret;
 
+	WARN_ON(dev->irq[0] == (unsigned int)-1);
+	WARN_ON(dev->irq[1] == (unsigned int)-1);
+
 	ret = request_resource(parent, &dev->res);
 	if (ret)
 		goto err_out;