Updated to 2.6.32.27
/drivers/pcmcia/pcmcia_resource.c
blob:d919e96c0afd62f5bde18da2ca0a974b63b66079 -> blob:7905285f707ee7a4c0823d809e53d1a3260b2b56
--- drivers/pcmcia/pcmcia_resource.c
+++ drivers/pcmcia/pcmcia_resource.c
@@ -39,7 +39,7 @@ module_param(io_speed, int, 0444);
#ifdef CONFIG_PCMCIA_PROBE
#include <asm/irq.h>
/* 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];
#endif
@@ -719,6 +719,9 @@ int pcmcia_request_irq(struct pcmcia_dev
for (try = 0; try < 64; try++) {
irq = try % 32;
+ if (irq > NR_IRQS)
+ continue;
+
/* marked as available by driver, and not blocked by userspace? */
if (!((mask >> irq) & 1))
continue;