Module Name: src
Committed By: skrll
Date: Fri Jun 10 14:53:31 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c
Log Message:
Add callout_stop while clearing stall. From t-hash.
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.73 -r1.28.2.74 src/sys/dev/usb/xhci.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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.73 src/sys/dev/usb/xhci.c:1.28.2.74
--- src/sys/dev/usb/xhci.c:1.28.2.73 Fri Jun 10 14:44:56 2016
+++ src/sys/dev/usb/xhci.c Fri Jun 10 14:53:31 2016
@@ -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 @@ xhci_event_transfer(struct xhci_softc *
* UF_ENDPOINT_HALT).
*/
xfer->ux_status = err;
+ callout_stop(&xfer->ux_callout);
xhci_clear_endpoint_stall_async(xfer);
return;
default:
