Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/sys/dev/usb Pull up following revision(s) (requested by r...
details: https://anonhg.NetBSD.org/src/rev/118f67f06237
branches: netbsd-9
changeset: 964011:118f67f06237
user: martin <martin%NetBSD.org@localhost>
date: Wed Jul 15 13:52:05 2020 +0000
description:
Pull up following revision(s) (requested by riastradh in ticket #1008):
sys/dev/usb/ualea.c: revision 1.10
Turn XXX comment into KASSERT.
diffstat:
sys/dev/usb/ualea.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diffs (33 lines):
diff -r 4671d8ebdeb0 -r 118f67f06237 sys/dev/usb/ualea.c
--- a/sys/dev/usb/ualea.c Wed Jul 15 13:47:40 2020 +0000
+++ b/sys/dev/usb/ualea.c Wed Jul 15 13:52:05 2020 +0000
@@ -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_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. */
Home |
Main Index |
Thread Index |
Old Index