Skip to content

Commit

Permalink
[PATCH] pcmcia: allow shared IRQs on pd6729 sockets
Browse files Browse the repository at this point in the history
Use IRQF_PROBE_SHARED flag for request_irq() to find an unused
interrupt for PCMCIA cards.

Signed-off-by: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  • Loading branch information
Komuro authored and Dominik Brodowski committed Dec 5, 2006
1 parent 4ae1cbf commit 3e022d0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/pcmcia/pd6729.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,10 +581,10 @@ static irqreturn_t pd6729_test(int irq, void *dev)
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;
}
Expand All @@ -610,7 +610,7 @@ static u_int __devinit pd6729_isa_scan(void)

/* 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 = ");
Expand Down

0 comments on commit 3e022d0

Please sign in to comment.