Skip to content

Commit

Permalink
drivers/net/irda/au1k_ir: fix obvious irq handler bugs
Browse files Browse the repository at this point in the history
interrupt handlers return a return value these days.

Also, kill always-true test and unneeded void* cast.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Jeff Garzik committed Oct 29, 2007
1 parent 2a397e8 commit e38c2c6
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/net/irda/au1k_ir.c
Original file line number Diff line number Diff line change
Expand Up @@ -627,19 +627,16 @@ static int au1k_irda_rx(struct net_device *dev)
}


void au1k_irda_interrupt(int irq, void *dev_id)
static irqreturn_t au1k_irda_interrupt(int dummy, void *dev_id)
{
struct net_device *dev = (struct net_device *) dev_id;

if (dev == NULL) {
printk(KERN_ERR "%s: isr: null dev ptr\n", dev->name);
return;
}
struct net_device *dev = dev_id;

writel(0, IR_INT_CLEAR); /* ack irda interrupts */

au1k_irda_rx(dev);
au1k_tx_ack(dev);

return IRQ_HANDLED;
}


Expand Down

0 comments on commit e38c2c6

Please sign in to comment.