diff options
| author | yongari <yongari@FreeBSD.org> | 2010-07-19 21:13:07 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2010-07-19 21:13:07 +0000 |
| commit | 098866995f188ced262ff7290022016d415d1f9b (patch) | |
| tree | b2690b6381e501f00146946fb03021068d51b103 /sys/dev/bce | |
| parent | aad8c00558c6f5e5e4be27394b3f6ffad3bc1aa3 (diff) | |
| download | FreeBSD-src-098866995f188ced262ff7290022016d415d1f9b.zip FreeBSD-src-098866995f188ced262ff7290022016d415d1f9b.tar.gz | |
When we didn't find a matching flash device, do not touch flash
config data. While I'm here, use return code of bce_init_nvram()
to set error instead of directly setting ENODEV.
Reviewed by: davidch
Diffstat (limited to 'sys/dev/bce')
| -rw-r--r-- | sys/dev/bce/if_bce.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index ad7209e..32eb692 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -2264,7 +2264,8 @@ bce_init_nvram(struct bce_softc *sc) sc->bce_flash_info = NULL; BCE_PRINTF("%s(%d): Unknown Flash NVRAM found!\n", __FILE__, __LINE__); - rc = ENODEV; + DBEXIT(BCE_VERBOSE_NVRAM); + return (ENODEV); } bce_init_nvram_get_flash_size: @@ -4796,10 +4797,8 @@ bce_chipinit(struct bce_softc *sc) } /* Prepare NVRAM for access. */ - if (bce_init_nvram(sc)) { - rc = ENODEV; + if ((rc = bce_init_nvram(sc)) != 0) goto bce_chipinit_exit; - } /* Set the kernel bypass block size */ val = REG_RD(sc, BCE_MQ_CONFIG); |
