]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] Fix timer race
authorRalf Baechle <ralf@linux-mips.org>
Wed, 18 Oct 2006 01:15:37 +0000 (02:15 +0100)
committerJeff Garzik <jeff@garzik.org>
Sat, 21 Oct 2006 18:20:02 +0000 (14:20 -0400)
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>
drivers/net/ioc3-eth.c

index e963dbf816bef71bc99f9dbbb637a070182e9a15..f56b00ee385e339198e950e060558dcba9418788 100644 (file)
@@ -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);