CVS commit: src/sys

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Tue Jan 22 15:02:34 UTC 2019

Modified Files:
        src/sys/dev/usb: uhci.c xhci.c
        src/sys/external/bsd/dwc2: dwc2.c

Log Message:
Revert the KASSERT


To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.56 -r1.57 src/sys/external/bsd/dwc2/dwc2.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/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.285 src/sys/dev/usb/uhci.c:1.286
--- src/sys/dev/usb/uhci.c:1.285	Tue Jan 22 06:42:33 2019
+++ src/sys/dev/usb/uhci.c	Tue Jan 22 15:02:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.285 2019/01/22 06:42:33 skrll Exp $	*/
+/*	$NetBSD: uhci.c,v 1.286 2019/01/22 15:02:33 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.285 2019/01/22 06:42:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.286 2019/01/22 15:02:33 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1740,7 +1740,6 @@ uhci_timeout_task(void *addr)
 	DPRINTF("xfer=%#jx", (uintptr_t)xfer, 0, 0, 0);
 
 	mutex_enter(&sc->sc_lock);
-	KASSERT(xfer->ux_status == USBD_TIMEOUT);
 	uhci_abort_xfer(xfer, USBD_TIMEOUT);
 	mutex_exit(&sc->sc_lock);
 }

Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.104 src/sys/dev/usb/xhci.c:1.105
--- src/sys/dev/usb/xhci.c:1.104	Tue Jan 22 06:42:33 2019
+++ src/sys/dev/usb/xhci.c	Tue Jan 22 15:02:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.104 2019/01/22 06:42:33 skrll Exp $	*/
+/*	$NetBSD: xhci.c,v 1.105 2019/01/22 15:02:33 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.104 2019/01/22 06:42:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.105 2019/01/22 15:02:33 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -4180,7 +4180,6 @@ xhci_timeout_task(void *addr)
 	struct xhci_softc * const sc = XHCI_XFER2SC(xfer);
 
 	mutex_enter(&sc->sc_lock);
-	KASSERT(xfer->ux_status == USBD_TIMEOUT);
 	xhci_abort_xfer(xfer, USBD_TIMEOUT);
 	mutex_exit(&sc->sc_lock);
 }

Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.56 src/sys/external/bsd/dwc2/dwc2.c:1.57
--- src/sys/external/bsd/dwc2/dwc2.c:1.56	Tue Jan 22 06:42:33 2019
+++ src/sys/external/bsd/dwc2/dwc2.c	Tue Jan 22 15:02:34 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc2.c,v 1.56 2019/01/22 06:42:33 skrll Exp $	*/
+/*	$NetBSD: dwc2.c,v 1.57 2019/01/22 15:02:34 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.56 2019/01/22 06:42:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.57 2019/01/22 15:02:34 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -341,7 +341,6 @@ dwc2_timeout_task(void *addr)
 	DPRINTF("xfer=%p\n", xfer);
 
 	mutex_enter(&sc->sc_lock);
-	KASSERT(xfer->ux_status == USBD_TIMEOUT);
 	dwc2_abort_xfer(xfer, USBD_TIMEOUT);
 	mutex_exit(&sc->sc_lock);
 }