Changeset b791e3e in mainline

Timestamp:

2010-10-22T14:10:20Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a498728

Parents:

34586183

Message:

Bugfix in libusbvirt

File:

• uspace/lib/usbvirt/main.c (modified) (3 diffs)

uspace/lib/usbvirt/main.c

@@ -52 +52 @@
         usb_address_t address = IPC_GET_ARG1(icall);
         usb_endpoint_t endpoint = IPC_GET_ARG2(icall);
+        size_t expected_len = IPC_GET_ARG5(icall);
         
         if (address != device->address) {
@@ -58 +59 @@
         }
         
-        size_t len;
-        void * buffer;
-        int rc = async_data_write_accept(&buffer, false,
-            1, USB_MAX_PAYLOAD_SIZE,
-            0, &len);
-        
-        if (rc != EOK) {
-                ipc_answer_0(iid, rc);
-                return;
+        size_t len = 0;
+        void * buffer = NULL;
+        if (expected_len > 0) {
+                int rc = async_data_write_accept(&buffer, false,
+                    1, USB_MAX_PAYLOAD_SIZE,
+                    0, &len);
+                
+                if (rc != EOK) {
+                        ipc_answer_0(iid, rc);
+                        return;
+                }
         }
         
         device->receive_data(device, endpoint, buffer, len);
         
-        free(buffer);
+        if (buffer != NULL) {
+                free(buffer);
+        }
         
         ipc_answer_0(iid, EOK);
@@ -209 +214 @@
         device_init(dev);
         
+        device = dev;
+        
         return EOK;
 }