[src/trunk]: src/sys Prevent the root hub sending updates once the root inter...

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

details:   https://anonhg.NetBSD.org/src/rev/d6dfe9f04d14
branches:  trunk
changeset: 331195:d6dfe9f04d14
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Aug 05 08:33:50 2014 +0000

description:
Prevent the root hub sending updates once the root interrupt abort is
called.

diffstat:

 sys/dev/usb/ohci.c           |  6 ++++--
 sys/dev/usb/xhci.c           |  6 ++++--
 sys/external/bsd/dwc2/dwc2.c |  6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r 542f94f9d900 -r d6dfe9f04d14 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Tue Aug 05 08:20:02 2014 +0000
+++ b/sys/dev/usb/ohci.c        Tue Aug 05 08:33:50 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.251 2014/08/05 06:35:24 skrll Exp $ */
+/*     $NetBSD: ohci.c,v 1.252 2014/08/05 08:33:50 skrll Exp $ */
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.251 2014/08/05 06:35:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.252 2014/08/05 08:33:50 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2872,6 +2872,8 @@
        KASSERT(mutex_owned(&sc->sc_lock));
        KASSERT(xfer->pipe->intrxfer == xfer);
 
+       sc->sc_intrxfer = NULL;
+
        xfer->status = USBD_CANCELLED;
        usb_transfer_complete(xfer);
 }
diff -r 542f94f9d900 -r d6dfe9f04d14 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Tue Aug 05 08:20:02 2014 +0000
+++ b/sys/dev/usb/xhci.c        Tue Aug 05 08:33:50 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.21 2014/08/05 06:35:24 skrll Exp $  */
+/*     $NetBSD: xhci.c,v 1.22 2014/08/05 08:33:50 skrll Exp $  */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.21 2014/08/05 06:35:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.22 2014/08/05 08:33:50 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2461,6 +2461,8 @@
 
        DPRINTF(("%s: remove\n", __func__));
 
+       sc->sc_intrxfer = NULL;
+
        xfer->status = USBD_CANCELLED;
        usb_transfer_complete(xfer);
 }
diff -r 542f94f9d900 -r d6dfe9f04d14 sys/external/bsd/dwc2/dwc2.c
--- a/sys/external/bsd/dwc2/dwc2.c      Tue Aug 05 08:20:02 2014 +0000
+++ b/sys/external/bsd/dwc2/dwc2.c      Tue Aug 05 08:33:50 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwc2.c,v 1.29 2014/08/05 06:35:24 skrll Exp $  */
+/*     $NetBSD: dwc2.c,v 1.30 2014/08/05 08:33:50 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.29 2014/08/05 06:35:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.30 2014/08/05 08:33:50 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -912,6 +912,8 @@
        KASSERT(mutex_owned(&sc->sc_lock));
        KASSERT(xfer->pipe->intrxfer == xfer);
 
+       sc->sc_intrxfer = NULL;
+
        xfer->status = USBD_CANCELLED;
        usb_transfer_complete(xfer);
 }