diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/irda/au1k_ir.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/irda/au1k_ir.c')
| -rw-r--r-- | drivers/net/irda/au1k_ir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index eb424681202..9b2eebdbb25 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c | |||
| @@ -353,13 +353,13 @@ static int au1k_irda_start(struct net_device *dev) | |||
| 353 | return retval; | 353 | return retval; |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | if ((retval = request_irq(AU1000_IRDA_TX_INT, &au1k_irda_interrupt, | 356 | if ((retval = request_irq(AU1000_IRDA_TX_INT, au1k_irda_interrupt, |
| 357 | 0, dev->name, dev))) { | 357 | 0, dev->name, dev))) { |
| 358 | printk(KERN_ERR "%s: unable to get IRQ %d\n", | 358 | printk(KERN_ERR "%s: unable to get IRQ %d\n", |
| 359 | dev->name, dev->irq); | 359 | dev->name, dev->irq); |
| 360 | return retval; | 360 | return retval; |
| 361 | } | 361 | } |
| 362 | if ((retval = request_irq(AU1000_IRDA_RX_INT, &au1k_irda_interrupt, | 362 | if ((retval = request_irq(AU1000_IRDA_RX_INT, au1k_irda_interrupt, |
| 363 | 0, dev->name, dev))) { | 363 | 0, dev->name, dev))) { |
| 364 | free_irq(AU1000_IRDA_TX_INT, dev); | 364 | free_irq(AU1000_IRDA_TX_INT, dev); |
| 365 | printk(KERN_ERR "%s: unable to get IRQ %d\n", | 365 | printk(KERN_ERR "%s: unable to get IRQ %d\n", |