[src/trunk]: src/sys/external/bsd/dwc2 KASSERT that the transfer callout is n...

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

details:   https://anonhg.NetBSD.org/src/rev/bd9f4c1ce80f
branches:  trunk
changeset: 792338:bd9f4c1ce80f
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Dec 31 09:10:43 2013 +0000

description:
KASSERT that the transfer callout is not pending.

Removes a XXX

diffstat:

 sys/external/bsd/dwc2/dwc2.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 304d86b742af -r bd9f4c1ce80f sys/external/bsd/dwc2/dwc2.c
--- a/sys/external/bsd/dwc2/dwc2.c      Tue Dec 31 01:55:05 2013 +0000
+++ b/sys/external/bsd/dwc2/dwc2.c      Tue Dec 31 09:10:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwc2.c,v 1.21 2013/11/28 06:56:36 skrll Exp $  */
+/*     $NetBSD: dwc2.c,v 1.22 2013/12/31 09:10:43 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.21 2013/11/28 06:56:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.22 2013/12/31 09:10:43 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -342,6 +342,9 @@
 
        mutex_spin_enter(&hsotg->lock);
        while ((dxfer = TAILQ_FIRST(&sc->sc_complete)) != NULL) {
+
+               KASSERT(!callout_pending(&dxfer->xfer.timeout_handle));
+
                /*
                 * dwc2_abort_xfer will remove this transfer from the
                 * sc_complete queue
@@ -353,8 +356,6 @@
                }
 
                TAILQ_REMOVE(&sc->sc_complete, dxfer, xnext);
-               /* XXXNH Already done - can I assert this? */
-               callout_stop(&dxfer->xfer.timeout_handle);
 
                mutex_spin_exit(&hsotg->lock);
                usb_transfer_complete(&dxfer->xfer);