Module Name: src
Committed By: msaitoh
Date: Thu Jan 3 08:46:03 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix error check. reported by David Binderman in kern/53821.
To generate a diff of this commit:
cvs rdiff -u -r1.612 -r1.613 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.612 src/sys/dev/pci/if_wm.c:1.613
--- src/sys/dev/pci/if_wm.c:1.612 Sun Dec 30 04:18:09 2018
+++ src/sys/dev/pci/if_wm.c Thu Jan 3 08:46:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.612 2018/12/30 04:18:09 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.613 2019/01/03 08:46:03 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.612 2018/12/30 04:18:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.613 2019/01/03 08:46:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -14636,7 +14636,8 @@ wm_resume_workarounds_pchlan(struct wm_s
/* Restore clear on SMB if no manageability engine
* is present
*/
- sc->phy.readreg_locked(dev, 1, I217_MEMPWR, &phy_reg);
+ rv = sc->phy.readreg_locked(dev, 1, I217_MEMPWR,
+ &phy_reg);
if (rv != 0)
goto release;
phy_reg |= I217_MEMPWR_DISABLE_SMB_RELEASE;
