CVS commit: [netbsd-9] src/sys/dev/pci

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Wed Dec 11 14:48:31 UTC 2019

Modified Files:
        src/sys/dev/pci [netbsd-9]: if_wm.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.645.2.1 -r1.645.2.2 src/sys/dev/pci/if_wm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645.2.1 src/sys/dev/pci/if_wm.c:1.645.2.2
--- src/sys/dev/pci/if_wm.c:1.645.2.1	Wed Nov  6 10:07:42 2019
+++ src/sys/dev/pci/if_wm.c	Wed Dec 11 14:48:31 2019
@@ -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 @@ wm_sgmii_readreg_locked(device_t dev, in
 {
 	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;