Module Name: src
Committed By: skrll
Date: Tue Dec 22 14:31:36 UTC 2015
Modified Files:
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Stop the callout if the transfer didn't get enqueued
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/dwc2/dwc2.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/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.37 src/sys/external/bsd/dwc2/dwc2.c:1.38
--- src/sys/external/bsd/dwc2/dwc2.c:1.37 Sun Aug 30 13:02:42 2015
+++ src/sys/external/bsd/dwc2/dwc2.c Tue Dec 22 14:31:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.37 2015/08/30 13:02:42 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.38 2015/12/22 14:31:36 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.37 2015/08/30 13:02:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.38 2015/12/22 14:31:36 skrll Exp $");
#include "opt_usb.h"
@@ -1425,6 +1425,7 @@ dwc2_device_start(usbd_xfer_handle xfer)
return USBD_IN_PROGRESS;
fail2:
+ callout_stop(&xfer->timeout_handle);
dwc2_urb->priv = NULL;
mutex_spin_exit(&hsotg->lock);
pool_cache_put(sc->sc_qtdpool, qtd);
