From 71fc269d3868978f2b29b5a194b27f725f6ae2b5 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Tue, 14 Oct 2003 06:26:40 -0400 Subject: [PATCH] [PATCH] - atmel wireless driver 1) Remove "#include " 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. --- drivers/net/wireless/atmel.c | 1 - drivers/net/wireless/atmel_cs.c | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index c592df7c6a4f1..87e8e8040a391 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -37,7 +37,6 @@ ******************************************************************************/ #include -#include #include #include diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 2e014c19e7b81..9d286ac666629 100644 --- 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++; -- 2.53.0