Module Name: src
Committed By: skrll
Date: Tue Dec 27 08:33:08 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: ohci.c
Log Message:
Actually set the transfer status on transfers in ohci_abort_xfer and
the controller is dying
To generate a diff of this commit:
cvs rdiff -u -r1.254.2.82 -r1.254.2.83 src/sys/dev/usb/ohci.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/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.254.2.82 src/sys/dev/usb/ohci.c:1.254.2.83
--- src/sys/dev/usb/ohci.c:1.254.2.82 Tue Dec 27 08:32:19 2016
+++ src/sys/dev/usb/ohci.c Tue Dec 27 08:33:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.82 2016/12/27 08:32:19 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.83 2016/12/27 08:33:08 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.82 2016/12/27 08:32:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.83 2016/12/27 08:33:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2269,7 +2269,7 @@ ohci_abort_xfer(struct usbd_xfer *xfer,
if (sc->sc_dying) {
/* If we're dying, just do the software part. */
- KASSERT(xfer->ux_status == status);
+ xfer->ux_status = status;
callout_halt(&xfer->ux_callout, &sc->sc_lock);
usb_transfer_complete(xfer);
return;
