Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfadbd29 authored by Ralf Baechle's avatar Ralf Baechle Committed by Jeff Garzik
Browse files

[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: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 089fff2a

drivers/net/ioc3-eth.c

+2 −2
Original line number Diff line number Diff line
@@ -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);