[src/trunk]: src/sys/dev/usb backout r1.16 as it seems to cause problems with...

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

details:   https://anonhg.NetBSD.org/src/rev/29bed76c98e5
branches:  trunk
changeset: 783954:29bed76c98e5
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jan 13 14:46:21 2013 +0000

description:
backout r1.16 as it seems to cause problems with uhid devices

diffstat:

 sys/dev/usb/dwc_otg.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r d79c15bda14e -r 29bed76c98e5 sys/dev/usb/dwc_otg.c
--- a/sys/dev/usb/dwc_otg.c     Sun Jan 13 14:43:23 2013 +0000
+++ b/sys/dev/usb/dwc_otg.c     Sun Jan 13 14:46:21 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwc_otg.c,v 1.21 2013/01/13 01:04:46 jmcneill Exp $    */
+/*     $NetBSD: dwc_otg.c,v 1.22 2013/01/13 14:46:21 jmcneill Exp $    */
 
 /*-
  * Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.21 2013/01/13 01:04:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.22 2013/01/13 14:46:21 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3241,7 +3241,7 @@
        uint8_t ch;
        uint32_t temp;
        uint32_t intrs;
-       struct dwc_otg_xfer *dxfer, *tmp;
+       struct dwc_otg_xfer *dxfer;
        uint8_t got_rx_status;
 
 //     DPRINTF("\n");
@@ -3330,8 +3330,11 @@
                got_rx_status = 1;
        }
 
-       TAILQ_FOREACH_SAFE(dxfer, &sc->sc_active, xnext, tmp) {
-               dwc_otg_xfer_do_fifo(&dxfer->xfer);
+       TAILQ_FOREACH(dxfer, &sc->sc_active, xnext) {
+               if (!dwc_otg_xfer_do_fifo(&dxfer->xfer)) {
+                       /* queue has been modified */
+                       goto repeat;
+               }
        }
 
        if (got_rx_status) {