[src/trunk]: src/sys/dev/pci Fix yet another NVM bank detect problem in wm(4)...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4f1b5e55ec8e
branches:  trunk
changeset: 787943:4f1b5e55ec8e
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Jul 16 10:30:27 2013 +0000

description:
Fix yet another NVM bank detect problem in wm(4). Use bank 0 if the detect
function failed. It's the same as FreeBSD. Observed and tested with Asus P8P67
Deluxe motherboard and tested by jnemeth.

diffstat:

 sys/dev/pci/if_wm.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 5921021389b3 -r 4f1b5e55ec8e sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue Jul 16 10:05:38 2013 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Jul 16 10:30:27 2013 +0000
@@ -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 @@
                }
        }
 
-       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 @@
        if (error) {
                aprint_error_dev(sc->sc_dev, "%s: failed to detect NVM bank\n",
                    __func__);
-               return error;
+               flash_bank = 0;
        }
 
        /*