Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb Fix wrong KASSERT in motg abort.



details:   https://anonhg.NetBSD.org/src/rev/30c813153807
branches:  trunk
changeset: 744939:30c813153807
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Feb 18 17:50:20 2020 +0000

description:
Fix wrong KASSERT in motg abort.

This has been wrong since last summer when we did the transition to
xfer->ux_status = USBD_CANCELLED earlier.

XXX pullup-9

diffstat:

 sys/dev/usb/motg.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 86e87f29f6a8 -r 30c813153807 sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c        Tue Feb 18 15:00:42 2020 +0000
+++ b/sys/dev/usb/motg.c        Tue Feb 18 17:50:20 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: motg.c,v 1.29 2020/02/15 13:56:55 riastradh Exp $      */
+/*     $NetBSD: motg.c,v 1.30 2020/02/18 17:50:20 riastradh Exp $      */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.29 2020/02/15 13:56:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.30 2020/02/18 17:50:20 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2234,7 +2234,6 @@
        }
 
        if (otgpipe->hw_ep->xfer == xfer) {
-               KASSERT(xfer->ux_status == USBD_IN_PROGRESS);
                otgpipe->hw_ep->xfer = NULL;
                if (otgpipe->hw_ep->ep_number > 0) {
                        /* select endpoint */



Home | Main Index | Thread Index | Old Index