Changeset 4046c1ea in mainline for uspace/drv/uhci/callback.c

Timestamp:

2011-01-29T00:14:07Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1431e8f

Parents:

b3258ad (diff), 44d8853 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge parent branch

File:

• uspace/drv/uhci/callback.c (modified) (1 diff)

uspace/drv/uhci/callback.c

@@ -9 +9 @@
         assert(instance);
         assert(func_in == NULL || func_out == NULL);
-        instance->new_buffer = malloc32(size);
-        if (!instance->new_buffer) {
-                uhci_print_error("Failed to allocate device acessible buffer.\n");
-                return ENOMEM;
+        if (size > 0) {
+                instance->new_buffer = malloc32(size);
+                if (!instance->new_buffer) {
+                        uhci_print_error("Failed to allocate device acessible buffer.\n");
+                        return ENOMEM;
+                }
+                if (func_out)
+                        memcpy(instance->new_buffer, buffer, size);
+        } else {
+                instance->new_buffer = NULL;
         }
 
-        if (func_out)
-                memcpy(instance->new_buffer, buffer, size);
 
         instance->callback_out = func_out;