diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 1999-09-24 16:27:32 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 1999-09-24 16:27:32 +0000 |
| commit | 2b832347ec3ba5db14862057ffcf030a58f35b93 (patch) | |
| tree | 9adbdb54f31c062ca1fe03e540f927a3891aaa94 | |
| parent | 3ea5059f1e909b89576581d339a54e5b6d01ca69 (diff) | |
| download | src-2b832347ec3ba5db14862057ffcf030a58f35b93.tar.gz src-2b832347ec3ba5db14862057ffcf030a58f35b93.zip | |
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>
Notes
Notes:
svn path=/head/; revision=51630
| -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 dd64447191d7..45cdf3ec5af6 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 dd64447191d7..45cdf3ec5af6 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)) { |