isdn/act2000: fix major bug. clean irq handler
Karsten Keil
Acked-bycommit e295b1287f0f559f4795ae75acb793b480594a04
Author: Jeff Garzik <[email protected]> Date: Fri Oct 19 19:30:28 2007 -0400
isdn/act2000: fix major bug. clean irq handler.
* invert sense of request_irq() test. otherwise we will always fail, when IRQ is available.
* no need to use 'irq' function arg, its stored in a data struct already
Acked-by Karsten Keil <[email protected]>
Signed-off-by Jeff Garzik <[email protected]>
drivers/isdn/act2000/act2000_isa.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
e295b1287f0f559f4795ae75acb793b480594a04
drivers/isdn/act2000/act2000_isa.c +8 -4
@@ -61,7 +61,7 @@ act2000_isa_detect(unsigned short portbase) }static irqreturn_t -act2000_isa_interrupt (int irq,void *dev_id) +act2000_isa_interrupt (int dummy,void *dev_id) {act2000_card *card = dev_id;u_char istatus;
@@ -80,7 +80,7 @@ act2000_isa_interrupt(int irq, void *dev_id)printk (KERN_WARNING "act2000: errIRQ\n" ); }if (istatus) -printk (KERN_DEBUG "act2000: ?IRQ %d %02x\n" , irq, istatus); +printk (KERN_DEBUG "act2000: ?IRQ %d %02x\n" , card->irq, istatus);return IRQ_HANDLED ; }
@@ -131,6 +131,8 @@ act2000_isa_enable_irq(act2000_card * card)int act2000_isa_config_irq (act2000_card * card,short irq) { +int old_irq; +if (card->flags &ACT2000_FLAGS_IVALID ) {free_irq (card->irq, card); }
@@ -139,8 +141,10 @@ act2000_isa_config_irq(act2000_card * card, short irq)if (!irq)return 0 ; -if (!request_irq (irq, &act2000_isa_interrupt,0 , card->regname, card)) { - card->irq = irq; + old_irq = card->irq; + card->irq = irq; +if (request_irq (irq, &act2000_isa_interrupt,0 , card->regname, card)) { + card->irq = old_irq; card->flags |=ACT2000_FLAGS_IVALID ;printk (KERN_WARNING "act2000: Could not request irq %d\n" ,irq);
Signature · 4 lines
Karsten Keil SuSE Labs ISDN and VOIP development SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)