Add some seat belts. If we set the error rc, then return it and don't

pretend things succeeded.  This can happen if the address returned
form bus_alloc_resource for the cis memory is occupied by some of
thing.
This commit is contained in:
Warner Losh 2001-08-29 05:11:44 +00:00
parent 15ed67d861
commit 0f78b1c02b

View File

@ -289,7 +289,7 @@ xe_probe(device_t dev)
int buf;
u_char ver_str[CISTPL_BUFSIZE>>1];
off_t offs;
int success, rc, i;
int success, rc = 0, i;
int rid;
struct resource *r;
@ -438,6 +438,8 @@ xe_probe(device_t dev)
/* Die now if something went wrong above */
if (success < 3)
return ENXIO;
if (rc != 0)
return (rc);
/* Check for certain strange CE2's that look like CE's */
if (strcmp(scp->card_type, "CE") == 0) {