diff options
| author | James Hogan <james@albanarts.com> | 2010-10-17 01:48:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 04:25:50 -0700 |
| commit | afed4ccb0d975f1d3c98880ecf19a24f3d842394 (patch) | |
| tree | 833c9663cc409846f17d180efa88c4098d474651 /drivers/net/b44.c | |
| parent | 31b9c19bfe32bed7fdf80cd0b1aa9d0f0569844a (diff) | |
| download | kernel-common-afed4ccb0d975f1d3c98880ecf19a24f3d842394.tar.gz kernel-common-afed4ccb0d975f1d3c98880ecf19a24f3d842394.tar.bz2 kernel-common-afed4ccb0d975f1d3c98880ecf19a24f3d842394.zip | |
b44: fix resume, request_irq after hw reset
On resume, call request_irq() after resetting the hardware rather than
before. It's a shared interrupt so the handler could be called
immediately if another device on the same irq interrupts (and will be
called immediately if CONFIG_DEBUG_SHIRQ=y), but unless the hardware is
reinitialised with b44_init_hw() the read of the interrupt status
register will hang the system.
Signed-off-by: James Hogan <james@albanarts.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 8e7c8a8e61c7..171da7f75108 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -2296,18 +2296,27 @@ static int b44_resume(struct ssb_device *sdev) if (!netif_running(dev)) return 0; + spin_lock_irq(&bp->lock); + b44_init_rings(bp); + b44_init_hw(bp, B44_FULL_RESET); + spin_unlock_irq(&bp->lock); + + /* + * As a shared interrupt, the handler can be called immediately. To be + * able to check the interrupt status the hardware must already be + * powered back on (b44_init_hw). + */ rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev); if (rc) { netdev_err(dev, "request_irq failed\n"); + spin_lock_irq(&bp->lock); + b44_halt(bp); + b44_free_rings(bp); + spin_unlock_irq(&bp->lock); return rc; } - spin_lock_irq(&bp->lock); - - b44_init_rings(bp); - b44_init_hw(bp, B44_FULL_RESET); netif_device_attach(bp->dev); - spin_unlock_irq(&bp->lock); b44_enable_ints(bp); netif_wake_queue(dev); |