Module Name: src
Committed By: skrll
Date: Fri Jan 3 12:20:26 UTC 2014
Modified Files:
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Call callout_reset on the xfer timeoute_handle before calling
dwc2_hcd_urb_enqueue
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 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.24 src/sys/external/bsd/dwc2/dwc2.c:1.25
--- src/sys/external/bsd/dwc2/dwc2.c:1.24 Fri Jan 3 12:07:37 2014
+++ src/sys/external/bsd/dwc2/dwc2.c Fri Jan 3 12:20:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.24 2014/01/03 12:07:37 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.25 2014/01/03 12:20:26 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.24 2014/01/03 12:07:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.25 2014/01/03 12:20:26 skrll Exp $");
#include "opt_usb.h"
@@ -1381,16 +1381,16 @@ dwc2_device_start(usbd_xfer_handle xfer)
/* might need to check cpu_intr_p */
mutex_spin_enter(&hsotg->lock);
- dwc2_urb->priv = xfer;
- retval = dwc2_hcd_urb_enqueue(hsotg, dwc2_urb, &dpipe->priv, 0);
- if (retval)
- goto fail;
-
if (xfer->timeout && !sc->sc_bus.use_polling) {
callout_reset(&xfer->timeout_handle, mstohz(xfer->timeout),
dwc2_timeout, xfer);
}
+ dwc2_urb->priv = xfer;
+ retval = dwc2_hcd_urb_enqueue(hsotg, dwc2_urb, &dpipe->priv, 0);
+ if (retval)
+ goto fail;
+
if (alloc_bandwidth) {
dwc2_allocate_bus_bandwidth(hsotg,
dwc2_hcd_get_ep_bandwidth(hsotg, dpipe),
