d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if_muge: Use lock assertion instead of broken locking in lan78xx_chip_init

Browse Source 
Previously lan78xx_chip_init locked the driver's mutex if not already
locked, but unlocked it only in the case of error.  This provided a
fairly clear indication that the function is already called with the
lock held, so just replace it with a lock assertion.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2018-05-25 17:31:43 +00:00
parent c0134460fc
commit 097f721b80
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/usb/net/if_muge.c
View File

@ -953,13 +953,10 @@ static int
lan78xx_chip_init(struct muge_softc *sc)
{
int err;
int locked;
uint32_t buf;
uint32_t burst_cap;
locked = mtx_owned(&sc->sc_mtx);
if (!locked)
MUGE_LOCK(sc);
MUGE_LOCK_ASSERT(sc, MA_OWNED);
/* Enter H/W config mode. */
lan78xx_write_reg(sc, ETH_HW_CFG, ETH_HW_CFG_LRST_);
@ -1132,9 +1129,6 @@ lan78xx_chip_init(struct muge_softc *sc)
return (0);
init_failed:
if (!locked)
MUGE_UNLOCK(sc);
muge_err_printf(sc, "lan78xx_chip_init failed (err=%d)\n", err);
return (err);
}