[src/nick-nhusb]: src/sys/dev/usb Add callout_stop while clearing stall. Fro...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b882dec15f36
branches:  nick-nhusb
changeset: 804664:b882dec15f36
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jun 10 14:53:31 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 bad4810d7441 -r b882dec15f36 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Fri Jun 10 14:44:56 2016 +0000
+++ b/sys/dev/usb/xhci.c        Fri Jun 10 14:53:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.28.2.73 2016/06/10 14:44:56 skrll Exp $     */
+/*     $NetBSD: xhci.c,v 1.28.2.74 2016/06/10 14:53:31 skrll Exp $     */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.73 2016/06/10 14:44:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.74 2016/06/10 14:53:31 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1766,6 +1766,7 @@
                 * UF_ENDPOINT_HALT).
                 */
                xfer->ux_status = err;
+               callout_stop(&xfer->ux_callout);
                xhci_clear_endpoint_stall_async(xfer);
                return;
        default: