Module Name: src
Committed By: joerg
Date: Fri Oct 4 21:10:18 UTC 2013
Modified Files:
src/sys/dev/ic: sl811hs.c
Log Message:
Move an assert to the point where the referenced variable is initialized.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 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.45 src/sys/dev/ic/sl811hs.c:1.46
--- src/sys/dev/ic/sl811hs.c:1.45 Thu Oct 3 13:19:24 2013
+++ src/sys/dev/ic/sl811hs.c Fri Oct 4 21:10:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.45 2013/10/03 13:19:24 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.46 2013/10/04 21:10:18 joerg Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.45 2013/10/03 13:19:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.46 2013/10/04 21:10:18 joerg Exp $");
#include "opt_slhci.h"
@@ -1340,8 +1340,6 @@ slhci_abort(struct usbd_xfer *xfer)
struct slhci_softc *sc;
struct slhci_pipe *spipe;
- KASSERT(mutex_owned(&sc->sc_lock));
-
spipe = (struct slhci_pipe *)xfer->pipe;
if (spipe == NULL)
@@ -1349,6 +1347,8 @@ slhci_abort(struct usbd_xfer *xfer)
sc = spipe->pipe.device->bus->hci_private;
+ KASSERT(mutex_owned(&sc->sc_lock));
+
DLOG(D_TRACE, "%s abort xfer %p spipe %p spipe->xfer %p",
pnames(spipe->ptype), xfer, spipe, spipe->xfer);
