Module Name: src
Committed By: msaitoh
Date: Mon Dec 17 04:21:45 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
When sc->phy.acquire() failed, it's not required to call sc->phy.release().
To generate a diff of this commit:
cvs rdiff -u -r1.606 -r1.607 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.606 src/sys/dev/pci/if_wm.c:1.607
--- src/sys/dev/pci/if_wm.c:1.606 Mon Dec 17 04:14:40 2018
+++ src/sys/dev/pci/if_wm.c Mon Dec 17 04:21:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.606 2018/12/17 04:14:40 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.607 2018/12/17 04:21:44 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.606 2018/12/17 04:14:40 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.607 2018/12/17 04:21:44 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -14192,7 +14192,7 @@ wm_ulp_disable(struct wm_softc *sc)
if (rv != 0) {
DPRINTF(WM_DEBUG_INIT, ("%s: %s: failed\n",
device_xname(sc->sc_dev), __func__));
- goto release;
+ return -1;
}
/* Toggle LANPHYPC */
@@ -14428,7 +14428,7 @@ wm_resume_workarounds_pchlan(struct wm_s
uint16_t phy_reg;
if (sc->phy.acquire(sc) != 0)
- goto release;
+ return -1;
/* Clear Auto Enable LPI after link up */
sc->phy.readreg_locked(dev, 1, I217_LPI_GPIO_CTRL, &phy_reg);
