Re: Memory leak closing USB interrupt endpoint

[David Imhoff]

On Fri, 22 May 2009 07:14:11 -0700
Bryan <bra...@gmail.com> wrote:
> 
> you were doing so well... patches must be submitted inline...  no attachments

Oops, sorry.

diff -ur sys.orig/usb/ehci.c sys/usb/ehci.c
--- sys.orig/usb/ehci.c Fri May 22 15:50:06 2009
+++ sys/usb/ehci.c      Fri May 22 15:55:15 2009
@@ -2323,10 +2323,6 @@
 {
        int s;
 
-       if (xfer->pipe->intrxfer == xfer) {
-               DPRINTF(("ehci_root_intr_abort: remove\n"));
-               xfer->pipe->intrxfer = NULL;
-       }
        xfer->status = USBD_CANCELLED;
        s = splusb();
        usb_transfer_complete(xfer);
@@ -3548,10 +3544,6 @@
 ehci_device_intr_abort(usbd_xfer_handle xfer)
 {
        DPRINTFN(1, ("ehci_device_intr_abort: xfer=%p\n", xfer));
-       if (xfer->pipe->intrxfer == xfer) {
-               DPRINTFN(1, ("ehci_device_intr_abort: remove\n"));
-               xfer->pipe->intrxfer = NULL;
-       }
        /*
         * XXX - abort_xfer uses ehci_sync_hc, which syncs via the advance
         *       async doorbell. That's dependant on the async list, wheras
diff -ur sys.orig/usb/ohci.c sys/usb/ohci.c
--- sys.orig/usb/ohci.c Fri May 22 15:50:06 2009
+++ sys/usb/ohci.c      Fri May 22 15:50:40 2009
@@ -2732,10 +2732,6 @@
 {
        int s;
 
-       if (xfer->pipe->intrxfer == xfer) {
-               DPRINTF(("ohci_root_intr_abort: remove\n"));
-               xfer->pipe->intrxfer = NULL;
-       }
        xfer->status = USBD_CANCELLED;
        s = splusb();
        usb_transfer_complete(xfer);
@@ -3069,10 +3065,6 @@
 void
 ohci_device_intr_abort(usbd_xfer_handle xfer)
 {
-       if (xfer->pipe->intrxfer == xfer) {
-               DPRINTF(("ohci_device_intr_abort: remove\n"));
-               xfer->pipe->intrxfer = NULL;
-       }
        ohci_abort_xfer(xfer, USBD_CANCELLED);
 }
 
diff -ur sys.orig/usb/uhci.c sys/usb/uhci.c
--- sys.orig/usb/uhci.c Fri May 22 15:50:06 2009
+++ sys/usb/uhci.c      Fri May 22 15:50:40 2009
@@ -2111,10 +2111,6 @@
 uhci_device_intr_abort(usbd_xfer_handle xfer)
 {
        DPRINTFN(1,("uhci_device_intr_abort: xfer=%p\n", xfer));
-       if (xfer->pipe->intrxfer == xfer) {
-               DPRINTFN(1,("uhci_device_intr_abort: remove\n"));
-               xfer->pipe->intrxfer = NULL;
-       }
        uhci_abort_xfer(xfer, USBD_CANCELLED);
 }
 
@@ -3437,10 +3433,6 @@
        timeout_del(&sc->sc_poll_handle);
        sc->sc_intr_xfer = NULL;
 
-       if (xfer->pipe->intrxfer == xfer) {
-               DPRINTF(("uhci_root_intr_abort: remove\n"));
-               xfer->pipe->intrxfer = 0;
-       }
        xfer->status = USBD_CANCELLED;
 #ifdef DIAGNOSTIC
        UXFER(xfer)->iinfo.isdone = 1;