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

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

details:   https://anonhg.NetBSD.org/src/rev/3e969f4359a0
branches:  netbsd-6
changeset: 776891:3e969f4359a0
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Feb 04 10:55:00 2015 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1244):
        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].
XXX pullup to netbsd-[67]

diffstat:

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

diffs (27 lines):

diff -r e9421efb0890 -r 3e969f4359a0 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Wed Feb 04 04:39:59 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Wed Feb 04 10:55:00 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.227.2.14 2014/12/04 06:04:07 snj Exp $     */
+/*     $NetBSD: if_wm.c,v 1.227.2.15 2015/02/04 10:55:00 martin 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.227.2.14 2014/12/04 06:04:07 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.15 2015/02/04 10:55:00 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1805,7 +1805,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