diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2007-02-15 23:37:29 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-20 11:18:12 -0500 |
| commit | c014f6c8f870271a8dcfe6e4139d6a651633aaf4 (patch) | |
| tree | eff601055a1a77dc71eff1d631c4fdd7f6b7b510 /drivers/net | |
| parent | eb2a021c4710b98081daa797d5a729ac23c240cd (diff) | |
| download | linux-c014f6c8f870271a8dcfe6e4139d6a651633aaf4.tar.gz linux-c014f6c8f870271a8dcfe6e4139d6a651633aaf4.tar.bz2 linux-c014f6c8f870271a8dcfe6e4139d6a651633aaf4.zip | |
sis190: RTNL and flush_scheduled_work deadlock
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sis190.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 45d91b159100..b08508b35833 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c @@ -909,6 +909,9 @@ static void sis190_phy_task(struct work_struct *work) rtnl_lock(); + if (!netif_running(dev)) + goto out_unlock; + val = mdio_read(ioaddr, phy_id, MII_BMCR); if (val & BMCR_RESET) { // FIXME: needlessly high ? -- FR 02/07/2005 @@ -981,6 +984,7 @@ static void sis190_phy_task(struct work_struct *work) netif_carrier_on(dev); } +out_unlock: rtnl_unlock(); } @@ -1102,8 +1106,6 @@ static void sis190_down(struct net_device *dev) netif_stop_queue(dev); - flush_scheduled_work(); - do { spin_lock_irq(&tp->lock); @@ -1857,6 +1859,7 @@ static void __devexit sis190_remove_one(struct pci_dev *pdev) struct net_device *dev = pci_get_drvdata(pdev); sis190_mii_remove(dev); + flush_scheduled_work(); unregister_netdev(dev); sis190_release_board(pdev); pci_set_drvdata(pdev, NULL); |