diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/bge/bge_chip2.c | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/io/bge/bge_main2.c | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/usr/src/uts/common/io/bge/bge_chip2.c b/usr/src/uts/common/io/bge/bge_chip2.c index 84b51b2762..76b3f784af 100644 --- a/usr/src/uts/common/io/bge/bge_chip2.c +++ b/usr/src/uts/common/io/bge/bge_chip2.c @@ -3057,14 +3057,11 @@ bge_chip_reset(bge_t *bgep, boolean_t enable_dma) * NVRAM Corruption Workaround */ for (tries = 0; tries < MAX_TRY_NVMEM_ACQUIRE; tries++) - if (bge_nvmem_acquire(bgep) == 0) + if (bge_nvmem_acquire(bgep) == EAGAIN) break; - if (tries >= MAX_TRY_NVMEM_ACQUIRE) { + if (tries >= MAX_TRY_NVMEM_ACQUIRE) BGE_DEBUG(("%s: fail to acquire nvram lock", bgep->ifname)); - bge_fm_ereport(bgep, DDI_FM_DEVICE_NO_RESPONSE); - return (DDI_FAILURE); - } #ifdef BGE_IPMI_ASF if (!bgep->asf_enabled) { diff --git a/usr/src/uts/common/io/bge/bge_main2.c b/usr/src/uts/common/io/bge/bge_main2.c index d3e4815298..1f8385f470 100644 --- a/usr/src/uts/common/io/bge/bge_main2.c +++ b/usr/src/uts/common/io/bge/bge_main2.c @@ -33,7 +33,7 @@ * This is the string displayed by modinfo, etc. * Make sure you keep the version ID up to date! */ -static char bge_ident[] = "Broadcom Gb Ethernet v0.53"; +static char bge_ident[] = "Broadcom Gb Ethernet v0.54"; /* * Property names @@ -436,8 +436,7 @@ bge_restart(bge_t *bgep, boolean_t reset_phys) if (bge_reset(bgep) != DDI_SUCCESS) retval = DDI_FAILURE; #endif - if (bgep->bge_mac_state == BGE_MAC_STARTED && - retval == DDI_SUCCESS) { + if (bgep->bge_mac_state == BGE_MAC_STARTED) { if (bge_start(bgep, reset_phys) != DDI_SUCCESS) retval = DDI_FAILURE; bgep->watchdog = 0; |