summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2015-03-23 22:48:51 +0000
committerjsg <jsg@openbsd.org>2015-03-23 22:48:51 +0000
commitfde537a41802be36f1a91270d59276b7820fd1fa (patch)
treedcea5f4ab03c68867c6e2bece0145449742f6d7f
parentMake rcmdsh(3) not fail if it is passed a non resolvable hostname. (diff)
downloadwireguard-openbsd-fde537a41802be36f1a91270d59276b7820fd1fa.tar.xz
wireguard-openbsd-fde537a41802be36f1a91270d59276b7820fd1fa.zip
unlock MII on smsc_miibus_writereg error
from Patrick Wildt
-rw-r--r--sys/dev/usb/if_smsc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c
index bef569124e4..53097e84889 100644
--- a/sys/dev/usb/if_smsc.c
+++ b/sys/dev/usb/if_smsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_smsc.c,v 1.17 2015/03/23 08:41:52 mpi Exp $ */
+/* $OpenBSD: if_smsc.c,v 1.18 2015/03/23 22:48:51 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
/*-
* Copyright (c) 2012
@@ -278,6 +278,7 @@ smsc_miibus_writereg(struct device *dev, int phy, int reg, int val)
smsc_lock_mii(sc);
if (smsc_wait_for_bits(sc, SMSC_MII_ADDR, SMSC_MII_BUSY) != 0) {
smsc_warn_printf(sc, "MII is busy\n");
+ smsc_unlock_mii(sc);
return;
}