[PATCH kernel 2.6.19-rc4] pd6729: Use IRQF_PROBE_SHARED flag for request_irq() to find an unused interrupt slot

[Komuro]

[PATCH kernel 2.6.19-rc4] 

 pd6729: Use IRQF_PROBE_SHARED flag for request_irq() to find an unused interrupt slot.


Signed-off-by: komurojun-mbn at nifty.com

Best Regards
Komuro

--- linux-2.6.19-rc4/drivers/pcmcia/pd6729.c.orig	2006-11-03 11:10:51.000000000 +0900
+++ linux-2.6.19-rc4/drivers/pcmcia/pd6729.c	2006-11-03 11:15:41.000000000 +0900
@@ -581,10 +581,10 @@
 	return IRQ_HANDLED;
 }
 
-static int pd6729_check_irq(int irq, int flags)
+static int pd6729_check_irq(int irq)
 {
-	if (request_irq(irq, pd6729_test, flags, "x", pd6729_test) != 0)
-		return -1;
+	if (request_irq(irq, pd6729_test, IRQF_PROBE_SHARED, "x", pd6729_test) 
+		!= 0) return -1;
 	free_irq(irq, pd6729_test);
 	return 0;
 }
@@ -610,7 +610,7 @@
 
 	/* just find interrupts that aren't in use */
 	for (i = 0; i < 16; i++)
-		if ((mask0 & (1 << i)) && (pd6729_check_irq(i, 0) == 0))
+		if ((mask0 & (1 << i)) && (pd6729_check_irq(i) == 0))
 			mask |= (1 << i);
 
 	printk(KERN_INFO "pd6729: ISA irqs = ");