From a265fa9c70046167d2b4bcceb7f399833f9b71e2 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Tue, 3 Aug 2010 09:33:45 +0200
Subject: [PATCH] --- yaml --- r: 206131 b: refs/heads/master c:
 127c03cdbad9bd5af5d7f33bd31a1015a90cb77f h: refs/heads/master i:   206129:
 f48165f0e3f3df14b5bcd06f0a9b407ca939c76a   206127:
 e73253545bee7dac5d721b5facb2796cec8a34fc v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/pcmcia/pcmcia_resource.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e71efd14e682..e59f8b8f3c7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f52e86ded65749c6037473013ad77b2afa4f68d
+refs/heads/master: 127c03cdbad9bd5af5d7f33bd31a1015a90cb77f
diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c
index d48437f83acf..54aa1c238cb3 100644
--- a/trunk/drivers/pcmcia/pcmcia_resource.c
+++ b/trunk/drivers/pcmcia/pcmcia_resource.c
@@ -677,7 +677,7 @@ EXPORT_SYMBOL(__pcmcia_request_exclusive_irq);
 #ifdef CONFIG_PCMCIA_PROBE
 
 /* mask of IRQs already reserved by other cards, we should avoid using them */
-static u8 pcmcia_used_irq[NR_IRQS];
+static u8 pcmcia_used_irq[32];
 
 static irqreturn_t test_action(int cpl, void *dev_id)
 {
@@ -700,6 +700,9 @@ static int pcmcia_setup_isa_irq(struct pcmcia_device *p_dev, int type)
 	for (try = 0; try < 64; try++) {
 		irq = try % 32;
 
+		if (irq > NR_IRQS)
+			continue;
+
 		/* marked as available by driver, not blocked by userspace? */
 		if (!((mask >> irq) & 1))
 			continue;