Changeset 52386 in vbox for trunk/src/VBox/Devices/USB/linux

Timestamp:

Aug 14, 2014 6:39:50 PM (11 years ago)

Author:

vboxsync

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

95537

Message:

USBProxyDevice-linux: Make sure USBDEVFS_URB_SHORT_NOT_OK is only ever set on input endpoints

File:

• trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp

@@ -1367 +1367 @@
     if (pUrb->enmDir == VUSBDIRECTION_IN)
         pUrbLnx->KUrb.endpoint |= 0x80;
+    pUrbLnx->KUrb.flags             = 0;
+    if (pUrb->enmDir == VUSBDIRECTION_IN && pUrb->fShortNotOk)
+        pUrbLnx->KUrb.flags        |= USBDEVFS_URB_SHORT_NOT_OK;
     pUrbLnx->KUrb.status            = 0;
-    pUrbLnx->KUrb.flags             = pUrb->fShortNotOk ? USBDEVFS_URB_SHORT_NOT_OK : 0; /* ISO_ASAP too? */
     pUrbLnx->KUrb.buffer            = pb;
     pUrbLnx->KUrb.buffer_length     = RT_MIN(cbLeft, SPLIT_SIZE);
@@ -1452 +1454 @@
     pUrbLnx->KUrb.endpoint          = pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? 0x80 : 0);
     pUrbLnx->KUrb.status            = 0;
-    pUrbLnx->KUrb.flags             = pUrb->fShortNotOk ? USBDEVFS_URB_SHORT_NOT_OK : 0;
+    pUrbLnx->KUrb.flags             = 0;
+    if (pUrb->enmDir == VUSBDIRECTION_IN && pUrb->fShortNotOk)
+        pUrbLnx->KUrb.flags        |= USBDEVFS_URB_SHORT_NOT_OK;
     pUrbLnx->KUrb.buffer            = pUrb->abData;
     pUrbLnx->KUrb.buffer_length     = pUrb->cbData;