Changeset 8e7c9fe in mainline for kernel/generic/src/udebug/udebug_ipc.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/generic/src/udebug/udebug_ipc.c (modified) (4 diffs)

kernel/generic/src/udebug/udebug_ipc.c

@@ -343 +343 @@
         sysarg_t uspace_addr;
         sysarg_t to_copy;
-        void *buffer;
+        void *buffer = NULL;
         int rc;
 
@@ -354 +354 @@
                 return;
         }
+
+        ASSERT(buffer != NULL);
 
         /*
@@ -385 +387 @@
         sysarg_t uspace_src;
         unsigned size;
-        void *buffer;
+        void *buffer = NULL;
         int rc;
 
@@ -398 +400 @@
                 return;
         }
+
+        ASSERT(buffer != NULL);
 
         IPC_SET_RETVAL(call->data, 0);