diff options
author | Pavel Roskin <proski@gnu.org> | 2006-04-07 04:10:19 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-04-24 16:15:49 -0400 |
commit | a6e26e8ddbe8717103556ecd8ecd383de32671e4 (patch) | |
tree | 3a6d4954784e68cd97871b33d76e28849abf294b | |
parent | 7c241d37fe0e6442c5cf3b5d73f7f58f2dc66352 (diff) |
[PATCH] orinoco: Remove useless CIS validation
The PCMCIA drivers would never be loaded if the CIS were wrong.
No other PCMCIA drivers validate CIS.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/orinoco_cs.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/spectrum_cs.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index 434f7d7ad841..0e81312f0d43 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c | |||
@@ -178,13 +178,10 @@ orinoco_cs_config(struct pcmcia_device *link) | |||
178 | int last_fn, last_ret; | 178 | int last_fn, last_ret; |
179 | u_char buf[64]; | 179 | u_char buf[64]; |
180 | config_info_t conf; | 180 | config_info_t conf; |
181 | cisinfo_t info; | ||
182 | tuple_t tuple; | 181 | tuple_t tuple; |
183 | cisparse_t parse; | 182 | cisparse_t parse; |
184 | void __iomem *mem; | 183 | void __iomem *mem; |
185 | 184 | ||
186 | CS_CHECK(ValidateCIS, pcmcia_validate_cis(link, &info)); | ||
187 | |||
188 | /* | 185 | /* |
189 | * This reads the card's CONFIG tuple to find its | 186 | * This reads the card's CONFIG tuple to find its |
190 | * configuration registers. | 187 | * configuration registers. |
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c index f7b77ce54d7b..a15c5d3361d8 100644 --- a/drivers/net/wireless/spectrum_cs.c +++ b/drivers/net/wireless/spectrum_cs.c | |||
@@ -653,13 +653,10 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
653 | int last_fn, last_ret; | 653 | int last_fn, last_ret; |
654 | u_char buf[64]; | 654 | u_char buf[64]; |
655 | config_info_t conf; | 655 | config_info_t conf; |
656 | cisinfo_t info; | ||
657 | tuple_t tuple; | 656 | tuple_t tuple; |
658 | cisparse_t parse; | 657 | cisparse_t parse; |
659 | void __iomem *mem; | 658 | void __iomem *mem; |
660 | 659 | ||
661 | CS_CHECK(ValidateCIS, pcmcia_validate_cis(link, &info)); | ||
662 | |||
663 | /* | 660 | /* |
664 | * This reads the card's CONFIG tuple to find its | 661 | * This reads the card's CONFIG tuple to find its |
665 | * configuration registers. | 662 | * configuration registers. |