[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/c45cba525ce1
branches:  netbsd-7
changeset: 798940:c45cba525ce1
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Feb 04 06:48:13 2015 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #490):
        sys/dev/pci/if_wm.c: revision 1.310
  Fix a bug that a workaround for SWSM.SMBI bit doesn't work correctly.
This problem was only occured with old boot ROM on 8257[12].

diffstat:

 sys/dev/pci/if_wm.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r bb19f8fd96af -r c45cba525ce1 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Wed Feb 04 06:46:33 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Wed Feb 04 06:48:13 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.289.2.2 2014/11/07 21:34:56 snj Exp $      */
+/*     $NetBSD: if_wm.c,v 1.289.2.3 2015/02/04 06:48:13 snj Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.2 2014/11/07 21:34:56 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.3 2015/02/04 06:48:13 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1831,7 +1831,7 @@
        case WM_T_82571:
        case WM_T_82572:
                reg = CSR_READ(sc, WMREG_SWSM2);
-               if ((reg & SWSM2_LOCK) != 0) {
+               if ((reg & SWSM2_LOCK) == 0) {
                        CSR_WRITE(sc, WMREG_SWSM2, reg | SWSM2_LOCK);
                        force_clear_smbi = true;
                } else