summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2011-12-03 03:34:41 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2011-12-03 03:34:41 +0000
commit4bfcceb4971aaa6faec629589fb94c0264bffdeb (patch)
tree4b6bd64610375101b6f3279bf615fe94451c07f0 /sys
parent0f8d08abc39405a7cea304734e5e003ecbf62493 (diff)
Make sure splx() is called before exiting wi_usb_tx_lock_try().
Found by Jan Klemkow. Thanks!
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/if_wi_usb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 7c8071980ae..7f11acaa788 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_usb.c,v 1.54 2011/09/18 23:24:12 krw Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.55 2011/12/03 03:34:40 krw Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -1885,6 +1885,7 @@ wi_usb_tx_lock_try(struct wi_usb_softc *sc)
DPRINTFN(10,("%s: %s: enter\n", sc->wi_usb_dev.dv_xname, __func__));
if (sc->wi_lock != 0) {
+ splx(s);
return 0; /* failed to aquire lock */
}