Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/usb Add callout_stop while clearing stall. From t-h...



details:   https://anonhg.NetBSD.org/src/rev/427c9fe7c2d4
branches:  trunk
changeset: 345840:427c9fe7c2d4
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jun 10 15:19:27 2016 +0000

description:
Add callout_stop while clearing stall.  From t-hash.

diffstat:

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

diffs (26 lines):

diff -r c1fa23a8b4ca -r 427c9fe7c2d4 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Fri Jun 10 13:31:43 2016 +0000
+++ b/sys/dev/usb/xhci.c        Fri Jun 10 15:19:27 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.56 2016/06/05 10:45:16 skrll Exp $  */
+/*     $NetBSD: xhci.c,v 1.57 2016/06/10 15:19:27 skrll Exp $  */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.56 2016/06/05 10:45:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.57 2016/06/10 15:19:27 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1764,6 +1764,7 @@
                 * UF_ENDPOINT_HALT).
                 */
                xfer->ux_status = err;
+               callout_stop(&xfer->ux_callout);
                xhci_clear_endpoint_stall_async(xfer);
                return;
        default:



Home | Main Index | Thread Index | Old Index