mirror of
https://github.com/adulau/aha.git
synced 2024-12-30 12:46:17 +00:00
[PATCH] Fix timer race
When closing the driver or reinitializing the hardware there is the usual del_timer() race condition that exists when timers re-add themselves. Fix by conversion to del_timer_sync(). Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
089fff2aa8
commit
cfadbd298e
1 changed files with 2 additions and 2 deletions
|
@ -1017,7 +1017,7 @@ static void ioc3_init(struct net_device *dev)
|
|||
struct ioc3_private *ip = netdev_priv(dev);
|
||||
struct ioc3 *ioc3 = ip->regs;
|
||||
|
||||
del_timer(&ip->ioc3_timer); /* Kill if running */
|
||||
del_timer_sync(&ip->ioc3_timer); /* Kill if running */
|
||||
|
||||
ioc3_w_emcr(EMCR_RST); /* Reset */
|
||||
(void) ioc3_r_emcr(); /* Flush WB */
|
||||
|
@ -1081,7 +1081,7 @@ static int ioc3_close(struct net_device *dev)
|
|||
{
|
||||
struct ioc3_private *ip = netdev_priv(dev);
|
||||
|
||||
del_timer(&ip->ioc3_timer);
|
||||
del_timer_sync(&ip->ioc3_timer);
|
||||
|
||||
netif_stop_queue(dev);
|
||||
|
||||
|
|
Loading…
Reference in a new issue