]> git.hungrycats.org Git - linux/commitdiff
[PATCH] ibmtr can unload with timers live
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Fri, 11 Jul 2003 13:48:33 +0000 (06:48 -0700)
committerSteve French <cifs.adm@hostme.bitkeeper.com>
Fri, 11 Jul 2003 13:48:33 +0000 (06:48 -0700)
drivers/net/pcmcia/ibmtr_cs.c

index dc3966d7675de1b71fd2922cc368edee7b32ec86..15cf41b089df20f3b20cb34d071284748d11b4d6 100644 (file)
@@ -293,9 +293,9 @@ static void ibmtr_detach(dev_link_t *link)
     dev = info->dev;
     {
        struct tok_info *ti = (struct tok_info *)dev->priv;
-       del_timer(&(ti->tr_timer));
+       del_timer_sync(&(ti->tr_timer));
     }
-    del_timer(&link->release);
+    del_timer_sync(&link->release);
     if (link->state & DEV_CONFIG) {
         ibmtr_release((u_long)link);
         if (link->state & DEV_STALE_CONFIG) {