Module Name: src
Committed By: msaitoh
Date: Mon Dec 9 02:30:30 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix a bug that wm_sgmii_readreg_locked() may return error even if error isn't
occured.
To generate a diff of this commit:
cvs rdiff -u -r1.650 -r1.651 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.650 src/sys/dev/pci/if_wm.c:1.651
--- src/sys/dev/pci/if_wm.c:1.650 Wed Dec 4 09:03:45 2019
+++ src/sys/dev/pci/if_wm.c Mon Dec 9 02:30:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.650 2019/12/04 09:03:45 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.651 2019/12/09 02:30:30 msaitoh 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.650 2019/12/04 09:03:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.651 2019/12/09 02:30:30 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -11626,7 +11626,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;
