From f4aa0cb3f387e643d189ea66d51471ee5e5d0537 Mon Sep 17 00:00:00 2001 From: msaitoh Date: Mon, 8 Aug 2022 07:49:18 +0000 Subject: Pass an error code correctly if phy.acquire() failed. This is not a real bug because the return value is not used. --- sys/dev/pci/if_wm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c index b6b6a306642..f9b096cd4fd 100644 --- a/sys/dev/pci/if_wm.c +++ b/sys/dev/pci/if_wm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.754 2022/08/08 07:44:40 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.755 2022/08/08 07:49:18 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.754 2022/08/08 07:44:40 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.755 2022/08/08 07:49:18 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -16399,9 +16399,10 @@ wm_set_eee_pchlan(struct wm_softc *sc) return 0; } - if (sc->phy.acquire(sc)) { + rv = sc->phy.acquire(sc); + if (rv != 0) { device_printf(dev, "%s: failed to get semaphore\n", __func__); - return 0; + return rv; } rv = sc->phy.readreg_locked(dev, 1, I82579_LPI_CTRL, &lpi_ctrl); -- cgit