Module Name: src
Committed By: skrll
Date: Tue May 10 21:15:54 UTC 2016
Modified Files:
src/sys/dev/ic: sl811hs.c
Log Message:
Remove comment about splusb and replace with KASSERT(mutex_owned())
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ic/sl811hs.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/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.59 src/sys/dev/ic/sl811hs.c:1.60
--- src/sys/dev/ic/sl811hs.c:1.59 Tue May 10 21:13:48 2016
+++ src/sys/dev/ic/sl811hs.c Tue May 10 21:15:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.59 2016/05/10 21:13:48 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.60 2016/05/10 21:15:54 skrll Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.59 2016/05/10 21:13:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.60 2016/05/10 21:15:54 skrll Exp $");
#include "opt_slhci.h"
@@ -1296,6 +1296,8 @@ slhci_abort(struct usbd_xfer *xfer)
struct slhci_softc *sc;
struct slhci_pipe *spipe;
+ KASSERT(mutex_owned(&sc->sc_lock));
+
spipe = SLHCI_PIPE2SPIPE(xfer->ux_pipe);
if (spipe == NULL)
@@ -1312,7 +1314,6 @@ slhci_abort(struct usbd_xfer *xfer)
callback:
xfer->ux_status = USBD_CANCELLED;
- /* Abort happens at IPL_USB. */
usb_transfer_complete(xfer);
}
