Changeset 82661 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 7, 2020 1:53:56 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135555

Message:

DevOHCI: Cleaned up old code (see bugref:9595).

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -3121 +3121 @@
          TdAddr, EdAddr, pUrb));
     ohciR3InFlightRemove(pThis, pThisCC, TdAddr);
-    VUSBIRhFreeUrb(pThisCC->RootHub.pIRhConn, pUrb);
     return false;
 }
@@ -3292 +3291 @@
     Log(("ohciR3ServiceTdMultiple: failed submitting pUrb=%p cbData=%#x EdAddr=%#010x cTds=%d TdAddr0=%#010x - rc=%Rrc\n",
          pUrb, cbTotal, EdAddr, cTds, TdAddr, rc));
-    ohciR3InFlightRemoveUrb(pThis, pThisCC, pUrb);
-    VUSBIRhFreeUrb(pThisCC->RootHub.pIRhConn, pUrb);
+    /* NB: We cannot call ohciR3InFlightRemoveUrb() because the URB is already gone! */
+    for (struct OHCITDENTRY *pCur = &Head; pCur; pCur = pCur->pNext, iTd++)
+        ohciR3InFlightRemove(pThis, pThisCC, pCur->TdAddr);
     return false;
 }
@@ -3539 +3539 @@
          pUrb, cbTotal, EdAddr, 1, ITdAddr, rc));
     ohciR3InFlightRemove(pThis, pThisCC, ITdAddr);
-    VUSBIRhFreeUrb(pThisCC->RootHub.pIRhConn, pUrb);
     return false;
 }