diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wan/n2.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wan/n2.c')
| -rw-r--r-- | drivers/net/wan/n2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c index 58c66819f39b..5394b51bdb2f 100644 --- a/drivers/net/wan/n2.c +++ b/drivers/net/wan/n2.c | |||
| @@ -376,7 +376,7 @@ static int __init n2_run(unsigned long io, unsigned long irq, | |||
| 376 | } | 376 | } |
| 377 | card->io = io; | 377 | card->io = io; |
| 378 | 378 | ||
| 379 | if (request_irq(irq, &sca_intr, 0, devname, card)) { | 379 | if (request_irq(irq, sca_intr, 0, devname, card)) { |
| 380 | printk(KERN_ERR "n2: could not allocate IRQ\n"); | 380 | printk(KERN_ERR "n2: could not allocate IRQ\n"); |
| 381 | n2_destroy_card(card); | 381 | n2_destroy_card(card); |
| 382 | return(-EBUSY); | 382 | return(-EBUSY); |