From e6eb8d816a2d1095e397f7bbfb9506fc02883bea Mon Sep 17 00:00:00 2001 From: Javier Achirica Date: Thu, 7 Aug 2003 10:29:15 -0400 Subject: [PATCH] [netdrvr airo] safer unload code --- drivers/net/wireless/airo.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index b760a5d6574b1..184349ffe9596 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -1608,13 +1608,10 @@ static void del_airo_dev( struct net_device *dev ); void stop_airo_card( struct net_device *dev, int freeres ) { struct airo_info *ai = dev->priv; - flush_scheduled_work(); disable_interrupts(ai); free_irq( dev->irq, dev ); - if (ai->flash) - kfree(ai->flash); - if (ai->rssi) - kfree(ai->rssi); + if (auto_wep) + del_timer_sync(&ai->timer); takedown_proc_entry( dev, ai ); if (ai->registered) { unregister_netdev( dev ); @@ -1625,7 +1622,11 @@ void stop_airo_card( struct net_device *dev, int freeres ) } ai->registered = 0; } - if (auto_wep) del_timer_sync(&ai->timer); + flush_scheduled_work(); + if (ai->flash) + kfree(ai->flash); + if (ai->rssi) + kfree(ai->rssi); if (freeres) { /* PCMCIA frees this stuff, so only for PCI and ISA */ release_region( dev->base_addr, 64 ); -- 2.53.0