[PATCH] - atmel wireless driver

1) Remove "#include <linux/version.h>" which was not needed and added
   bad extra compile dependencies.

2) Fix typo in module description.

3) Make card detection code cope with buggy SMC CIS entries.

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index c592df7c6a4f1c77cca4724a853e6c4d0164909e..87e8e8040a391cdda00a07a56f304d77389794eb 100644 (file)
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -37,7 +37,6 @@
 ******************************************************************************/
 
 #include <linux/config.h>
-#include <linux/version.h>
 #include <linux/init.h>
 
 #include <linux/kernel.h>

diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 2e014c19e7b811f6a1fcde1328ca57cfdc69b2ca..9d286ac666629b2193ea55bbd15330d675d7d9cf 100644 (file)
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -84,7 +84,7 @@ static u_int irq_mask = 0xdeb8;
 static int irq_list[4] = { -1 };
 
 MODULE_AUTHOR("Simon Kelley");
-MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethnet cards.");
+MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("Atmel at76c50x PCMCIA cards");
 MODULE_PARM(irq_mask, "i");
@@ -404,9 +404,12 @@ static void atmel_config(dev_link_t *link)
                                        goto mismatch;
                                for (k = 0; k < j; k++) {
                                        while ((*p != '\0') && (*p != '/')) p++;
-                                       if (*p == '\0')
-                                               goto mismatch;
-                                       p++;
+                                       if (*p == '\0') {
+                                               if (*q != '\0')
+                                                       goto mismatch;
+                                       } else {
+                                               p++;
+                                       }
                                }
                                while((*q != '\0') && (*p != '\0') && 
                                      (*p != '/') && (*p == *q)) p++, q++;