diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-04 13:38:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-04 13:38:31 -0700 |
| commit | e990b37b906b6137d353ef2a918e15e5763d70ec (patch) | |
| tree | e802458ee43d4b0a2b6d39eb25929858ceb7fd61 /drivers/net/dm9000.c | |
| parent | 34624d6631b6b3a1df16407a847286bb6233a96b (diff) | |
| parent | 23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159 (diff) | |
| download | kernel_replicant_linux-e990b37b906b6137d353ef2a918e15e5763d70ec.tar.gz kernel_replicant_linux-e990b37b906b6137d353ef2a918e15e5763d70ec.tar.bz2 kernel_replicant_linux-e990b37b906b6137d353ef2a918e15e5763d70ec.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/dm9000.c')
| -rw-r--r-- | drivers/net/dm9000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index fbaff3584bd4..ee597e676ee5 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -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 */ @@ -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; |