From e70906c954db05f4968d76182e518bbda4cab7f6 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 2 Jun 2011 18:55:13 +0100
Subject: [PATCH] --- yaml --- r: 253229 b: refs/heads/master c:
 c5182b8867e189e14a8df5dbfcba1c73f286e061 h: refs/heads/master i:   253227:
 eeccf521cbc7778fa22640f9f280643bd478778b v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/irq/irqdesc.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e85f41d99488..ffb237565961 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7fbad300a7a6432238f086e3c9a61538a905858
+refs/heads/master: c5182b8867e189e14a8df5dbfcba1c73f286e061
diff --git a/trunk/kernel/irq/irqdesc.c b/trunk/kernel/irq/irqdesc.c
index c7ddc87d6c87..4c60a50e66b2 100644
--- a/trunk/kernel/irq/irqdesc.c
+++ b/trunk/kernel/irq/irqdesc.c
@@ -344,6 +344,12 @@ irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node)
 	if (!cnt)
 		return -EINVAL;
 
+	if (irq >= 0) {
+		if (from > irq)
+			return -EINVAL;
+		from = irq;
+	}
+
 	mutex_lock(&sparse_irq_lock);
 
 	start = bitmap_find_next_zero_area(allocated_irqs, IRQ_BITMAP_BITS,