Module Name: src
Committed By: martin
Date: Wed Jul 15 13:52:05 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-9]: ualea.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1008):
sys/dev/usb/ualea.c: revision 1.10
Turn XXX comment into KASSERT.
To generate a diff of this commit:
cvs rdiff -u -r1.9.10.1 -r1.9.10.2 src/sys/dev/usb/ualea.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/usb/ualea.c
diff -u src/sys/dev/usb/ualea.c:1.9.10.1 src/sys/dev/usb/ualea.c:1.9.10.2
--- src/sys/dev/usb/ualea.c:1.9.10.1 Mon Jul 13 14:32:20 2020
+++ src/sys/dev/usb/ualea.c Wed Jul 15 13:52:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ualea.c,v 1.9.10.1 2020/07/13 14:32:20 martin Exp $ */
+/* $NetBSD: ualea.c,v 1.9.10.2 2020/07/15 13:52:05 martin Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ualea.c,v 1.9.10.1 2020/07/13 14:32:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ualea.c,v 1.9.10.2 2020/07/15 13:52:05 martin Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -198,12 +198,9 @@ ualea_xfer(struct ualea_softc *sc)
ualea_xfer_done);
/* Issue xfer or complain if we can't. */
- /*
- * XXX Does USBD_NORMAL_COMPLETION (= 0) make sense here? The
- * xfer can't complete synchronously because of the lock.
- */
status = usbd_transfer(sc->sc_xfer);
- if (status && status != USBD_IN_PROGRESS) {
+ KASSERT(status != USBD_NORMAL_COMPLETION); /* asynchronous xfer */
+ if (status != USBD_IN_PROGRESS) {
aprint_error_dev(sc->sc_dev, "failed to issue xfer: %d\n",
status);
/* We failed -- let someone else have a go. */
