Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 253057
b: refs/heads/master
c: 6979d5d
h: refs/heads/master
i:
  253055: 2a87299
v: v3
  • Loading branch information
Mark Brown authored and David S. Miller committed Jun 2, 2011
1 parent cb97e4c commit b7172f2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d
refs/heads/master: 6979d5dd96a4a4975ce240982436e92a3da23315
6 changes: 3 additions & 3 deletions trunk/drivers/net/dm9000.c
Original file line number Diff line number Diff line change
Expand Up @@ -1157,9 +1157,6 @@ dm9000_open(struct net_device *dev)

irqflags |= IRQF_SHARED;

if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev))
return -EAGAIN;

/* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */
iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */
mdelay(1); /* delay needs by DM9000B */
Expand All @@ -1168,6 +1165,9 @@ dm9000_open(struct net_device *dev)
dm9000_reset(db);
dm9000_init_dm9000(dev);

if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev))
return -EAGAIN;

/* Init driver variable */
db->dbug_cnt = 0;

Expand Down

0 comments on commit b7172f2

Please sign in to comment.