diff options
| author | obrien <obrien@FreeBSD.org> | 1999-09-24 16:27:32 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-09-24 16:27:32 +0000 |
| commit | df3104f6f2e8f1484019cbd3d7a64676358fe59d (patch) | |
| tree | 542f3d922cbf47022da22fedc778d189721ffdcc | |
| parent | 20f9db93a619ff9a63dacb3bb6817a506bbe9d90 (diff) | |
| download | FreeBSD-src-df3104f6f2e8f1484019cbd3d7a64676358fe59d.zip FreeBSD-src-df3104f6f2e8f1484019cbd3d7a64676358fe59d.tar.gz | |
Switch the order of a two tests so that the error actually has to occur
for you to be told there was an error [during verbose boot].
I poked him for the fix, he poked me to get it committed.
Submitted by: Jason Young <doogie@anet-stl.com>
| -rw-r--r-- | sys/dev/ep/if_ep.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/if_ep.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index dd64447..45cdf3e 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -195,8 +195,8 @@ ep_pccard_init(devi) epb->cmd_off = 0; epb->prod_id = get_e(sc, EEPROM_PROD_ID); - if (bootverbose) printf("ep%d: Pass 1 of 2 detection failed (nonfatal)\n", is->id_unit); if (!ep_pccard_identify(epb, is->id_unit)) { + if (bootverbose) printf("ep%d: Pass 1 of 2 detection failed (nonfatal)\n", is->id_unit); epb->cmd_off = 2; epb->prod_id = get_e(sc, EEPROM_PROD_ID); if (!ep_pccard_identify(epb, is->id_unit)) { diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c index dd64447..45cdf3e 100644 --- a/sys/i386/isa/if_ep.c +++ b/sys/i386/isa/if_ep.c @@ -195,8 +195,8 @@ ep_pccard_init(devi) epb->cmd_off = 0; epb->prod_id = get_e(sc, EEPROM_PROD_ID); - if (bootverbose) printf("ep%d: Pass 1 of 2 detection failed (nonfatal)\n", is->id_unit); if (!ep_pccard_identify(epb, is->id_unit)) { + if (bootverbose) printf("ep%d: Pass 1 of 2 detection failed (nonfatal)\n", is->id_unit); epb->cmd_off = 2; epb->prod_id = get_e(sc, EEPROM_PROD_ID); if (!ep_pccard_identify(epb, is->id_unit)) { |
