Changeset 53633 in vbox for trunk/src/VBox

Timestamp:

Jan 2, 2015 10:42:00 AM (10 years ago)

Author:

vboxsync

Message:

USB: fix debug assertion

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBDevice.cpp (modified) (1 diff)
• VUSBInternal.h (modified) (1 diff)
• VUSBUrb.cpp (modified) (2 diffs)

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

@@ -1053 +1053 @@
 
         LogFlow(("%s: vusbDevCancelAllUrbs: CANCELING URB\n", pUrb->pszDesc));
-        vusbUrbCancelWorker(pUrb, CANCELMODE_FAIL);
+        int rc = vusbUrbCancelWorker(pUrb, CANCELMODE_FAIL);
+        AssertRC(rc);
         pUrb = pNext;
     }

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -459 +459 @@
 DECLHIDDEN(int) vusbDevIoThreadExec(PVUSBDEV pDev, uint32_t fFlags, PFNRT pfnFunction, unsigned cArgs, ...);
 DECLHIDDEN(int) vusbDevIoThreadExecSync(PVUSBDEV pDev, PFNRT pfnFunction, unsigned cArgs, ...);
-DECLHIDDEN(void) vusbUrbCancelWorker(PVUSBURB pUrb, CANCELMODE enmMode);
+DECLHIDDEN(int) vusbUrbCancelWorker(PVUSBURB pUrb, CANCELMODE enmMode);
 
 void vusbUrbCompletionReadAhead(PVUSBURB pUrb);

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

@@ -2080 +2080 @@
  * The worker for vusbUrbCancel() which is executed on the I/O thread.
  *
- * @returns nothing.
+ * @returns IPRT status code.
  * @param   pUrb        The URB to cancel.
  * @param   enmMode     The way the URB should be canceled.
  */
-DECLHIDDEN(void) vusbUrbCancelWorker(PVUSBURB pUrb, CANCELMODE enmMode)
+DECLHIDDEN(int) vusbUrbCancelWorker(PVUSBURB pUrb, CANCELMODE enmMode)
 {
     vusbUrbAssert(pUrb);
@@ -2137 +2137 @@
         }
     }
+    return VINF_SUCCESS;
 }