From b7172f2237a571e4817f4a263069edf22fcf89c5 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 1 Jun 2011 10:18:09 +0000 Subject: [PATCH] --- yaml --- r: 253057 b: refs/heads/master c: 6979d5dd96a4a4975ce240982436e92a3da23315 h: refs/heads/master i: 253055: 2a872998f06dbe1b5e6ca98cf6fd643a2ffd2e78 v: v3 --- [refs] | 2 +- trunk/drivers/net/dm9000.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6f552a9bb1b5..5ad57cf5bc57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d +refs/heads/master: 6979d5dd96a4a4975ce240982436e92a3da23315 diff --git a/trunk/drivers/net/dm9000.c b/trunk/drivers/net/dm9000.c index fbaff3584bd4..ee597e676ee5 100644 --- a/trunk/drivers/net/dm9000.c +++ b/trunk/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;