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

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

details:   https://anonhg.NetBSD.org/src/rev/4d46dd833dff
branches:  netbsd-9
changeset: 963408:4d46dd833dff
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Dec 11 14:48:31 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #541):

        sys/dev/pci/if_wm.c: revision 1.651

 Fix a bug that wm_sgmii_readreg_locked() may return error even if error isn't
occurred.

diffstat:

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

diffs (27 lines):

diff -r 407d153dd6ea -r 4d46dd833dff sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Wed Dec 11 14:46:28 2019 +0000
+++ b/sys/dev/pci/if_wm.c       Wed Dec 11 14:48:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.645.2.1 2019/11/06 10:07:42 martin Exp $   */
+/*     $NetBSD: if_wm.c,v 1.645.2.2 2019/12/11 14:48:31 martin Exp $   */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.1 2019/11/06 10:07:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.2 2019/12/11 14:48:31 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -11625,7 +11625,7 @@
 {
        struct wm_softc *sc = device_private(dev);
        uint32_t i2ccmd;
-       int i, rv;
+       int i, rv = 0;
 
        i2ccmd = (reg << I2CCMD_REG_ADDR_SHIFT)
            | (phy << I2CCMD_PHY_ADDR_SHIFT) | I2CCMD_OPCODE_READ;