Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix yet another NVM bank detect problem in wm(4). Use bank 0 if the detect

Browse Source 
function failed. It's the same as FreeBSD. Observed and tested with Asus P8P67
Deluxe motherboard and tested by jnemeth.
This commit is contained in:
msaitoh 2013-07-16 10:30:27 +00:00
parent 55efcbee9d
commit 74224ab6c4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/pci/if_wm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wm.c,v 1.261 2013/06/27 09:57:49 msaitoh Exp $ */
/* $NetBSD: if_wm.c,v 1.262 2013/07/16 10:30:27 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.261 2013/06/27 09:57:49 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.262 2013/07/16 10:30:27 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -7596,7 +7596,8 @@ wm_valid_nvm_bank_detect_ich8lan(struct wm_softc *sc, unsigned int *bank)
}
}
aprint_error_dev(sc->sc_dev, "EEPROM not present\n");
DPRINTF(WM_DEBUG_NVM, ("%s: No valid NVM bank present\n",
device_xname(sc->sc_dev)));
return -1;
}
@ -7628,7 +7629,7 @@ wm_read_eeprom_ich8(struct wm_softc *sc, int offset, int words, uint16_t *data)
if (error) {
aprint_error_dev(sc->sc_dev, "%s: failed to detect NVM bank\n",
__func__);
return error;
flash_bank = 0;
}
/*