Source-Changes-HG archive

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

[src/nick-nhusb]: src/sys/dev/usb Actually set the transfer status on transfe...



details:   https://anonhg.NetBSD.org/src/rev/f2c9761663f6
branches:  nick-nhusb
changeset: 334570:f2c9761663f6
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Dec 27 08:33:08 2016 +0000

description:
Actually set the transfer status on transfers in ohci_abort_xfer and
the controller is dying

diffstat:

 sys/dev/usb/ohci.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 1f41f362efa6 -r f2c9761663f6 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Tue Dec 27 08:32:19 2016 +0000
+++ b/sys/dev/usb/ohci.c        Tue Dec 27 08:33:08 2016 +0000
@@ -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 @@
 
        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;



Home | Main Index | Thread Index | Old Index