[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-24
Subject:    del_timer_sync fixes for fmvj18x_cs net driver
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2002-10-29 1:42:31
[Download RAW message or body]

ChangeSet 1.770, 2002/10/28 20:42:31-05:00, alan@lxorguk.ukuu.org.uk

	del_timer_sync fixes for fmvj18x_cs net driver


# This patch includes the following deltas:
#	           ChangeSet	1.769   -> 1.770  
#	drivers/net/pcmcia/fmvj18x_cs.c	1.11    -> 1.12   
#

 fmvj18x_cs.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


diff -Nru a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
--- a/drivers/net/pcmcia/fmvj18x_cs.c	Tue Oct 29 04:08:54 2002
+++ b/drivers/net/pcmcia/fmvj18x_cs.c	Tue Oct 29 04:08:54 2002
@@ -362,7 +362,7 @@
     if (*linkp == NULL)
 	return;
 
-    del_timer(&link->release);
+    del_timer_sync(&link->release);
     if (link->state & DEV_CONFIG) {
 	fmvj18x_release((u_long)link);
 	if (link->state & DEV_STALE_CONFIG) {
@@ -571,8 +571,7 @@
     case XXX10304:
 	/* Read MACID from Buggy CIS */
 	if (fmvj18x_get_hwinfo(link, tuple.TupleData) == -1) {
-	    printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net 
-		address.");
+	    printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net address.\n");
 	    unregister_netdev(dev);
 	    goto failed;
 	}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]