summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2016-06-10 15:19:27 +0000
committerskrll <skrll@NetBSD.org>2016-06-10 15:19:27 +0000
commitfd264bc3439ea2f31d1616a1344c96e57b362be0 (patch)
treeb748a8db620a21d188a0004dc8039657cbb7b0e3 /sys/dev
parent9d07c6951111af4da6c06f9194f7be7164089c5e (diff)
Add callout_stop while clearing stall. From t-hash.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/xhci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index b80413015a3..43be3f3ad5a 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -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 @@ xhci_event_transfer(struct xhci_softc * const sc,
* UF_ENDPOINT_HALT).
*/
xfer->ux_status = err;
+ callout_stop(&xfer->ux_callout);
xhci_clear_endpoint_stall_async(xfer);
return;
default: