Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202639
b: refs/heads/master
c: 38454db
h: refs/heads/master
i:
  202637: 629c4f6
  202635: 5d6b967
  202631: bba75b4
  202623: 8ebc8d0
v: v3
  • Loading branch information
Finn Thain authored and David S. Miller committed Jun 2, 2010
1 parent 7206e94 commit c95af6f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c1f8fc57c046903b5e7c891f2922592d5f775af3
refs/heads/master: 38454db3f0b694df929073a5a867edf30551d950
11 changes: 6 additions & 5 deletions trunk/drivers/net/mac8390.c
Original file line number Diff line number Diff line change
Expand Up @@ -641,12 +641,13 @@ static int __init mac8390_initdev(struct net_device *dev,

static int mac8390_open(struct net_device *dev)
{
int err;

__ei_open(dev);
if (request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev)) {
pr_info("%s: unable to get IRQ %d.\n", dev->name, dev->irq);
return -EAGAIN;
}
return 0;
err = request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev);
if (err)
pr_info("%s: unable to get IRQ %d\n", dev->name, dev->irq);
return err;
}

static int mac8390_close(struct net_device *dev)
Expand Down

0 comments on commit c95af6f

Please sign in to comment.