diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-01 10:18:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-01 21:22:15 -0700 |
| commit | 6979d5dd96a4a4975ce240982436e92a3da23315 (patch) | |
| tree | b8a5c017e168d87f91668b5cab89c7df56dcda58 | |
| parent | b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d (diff) | |
| download | linux-stable-6979d5dd96a4a4975ce240982436e92a3da23315.tar.gz linux-stable-6979d5dd96a4a4975ce240982436e92a3da23315.tar.bz2 linux-stable-6979d5dd96a4a4975ce240982436e92a3da23315.zip | |
net: dm9000: Get the chip in a known good state before enabling interrupts
Currently the DM9000 driver requests the primary interrupt before it
resets the chip and puts it into a known good state. This means that if
the chip is asserting interrupt for some reason we can end up with a
screaming IRQ that the interrupt handler is unable to deal with. Avoid
this by only requesting the interrupt after we've reset the chip so we
know what state it's in.
This started manifesting itself on one of my boards in the past month or
so, I suspect as a result of some core infrastructure changes removing
some form of mitigation against bad behaviour here, even when things boot
it seems that the new code brings the interface up more quickly.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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; |