From 5f7726f4e7a3400d200c0152122d30f3dd541166 Mon Sep 17 00:00:00 2001 From: ps Date: Tue, 12 Sep 2000 11:03:12 +0000 Subject: Move the detection of Linksys PCMCIA cards from attach to probe. This should solve the problems people were seeing with this driver. Reported by: phk & others. --- sys/dev/ed/if_ed_pccard.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sys/dev/ed/if_ed_pccard.c') diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index 168170b..76d318f 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -63,6 +63,7 @@ static int ed_pccard_detach(device_t); static void ax88190_geteprom(struct ed_softc *); static int ed_pccard_memwrite(device_t dev, off_t offset, u_char byte); static int ed_pccard_memread(device_t dev, off_t offset, u_char *buf, int size); +static int linksys; static device_method_t ed_pccard_methods[] = { /* Device interface */ @@ -170,6 +171,7 @@ ed_pccard_probe(device_t dev) ed_release_resources(dev); end: + linksys = ed_get_Linksys(dev); if (error == 0) error = ed_alloc_irq(dev, 0, 0); @@ -201,7 +203,7 @@ ed_pccard_attach(device_t dev) return (error); } - if (ed_get_Linksys(sc) == 0) { + if (linksys == 0) { pccard_get_ether(dev, ether_addr); for (i = 0, sum = 0; i < ETHER_ADDR_LEN; i++) sum |= ether_addr[i]; -- cgit v1.1