Changeset ac2c3f8f in mainline

Timestamp:

2011-09-23T15:41:57Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

6fe0bf8d

Parents:

086290d (diff), 8895d05 (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 with mainline

Location:

uspace

Files:

• drv/bus/usb/usbhub/usbhub.c (modified) (1 diff)
• lib/c/generic/malloc.c (modified) (1 diff)
• srv/devman/main.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -130 +130 @@
 
         opResult = ddf_fun_bind(hub_fun);
-        assert(opResult == EOK);
-        opResult = ddf_fun_add_to_category(hub_fun, "hub");
         assert(opResult == EOK);
 

uspace/lib/c/generic/malloc.c

@@ -873 +873 @@
 void free(const void *addr)
 {
+        if (addr == NULL)
+                return;
+
         futex_down(&malloc_futex);
         

uspace/srv/devman/main.c

@@ -490 +490 @@
         if (rc == EOK) {
                 loc_service_add_to_cat(fun->service_id, cat_id);
+                log_msg(LVL_NOTE, "Function `%s' added to category `%s'.",
+                    fun->pathname, cat_name);
         } else {
                 log_msg(LVL_ERROR, "Failed adding function `%s' to category "
@@ -495 +497 @@
         }
         
-        log_msg(LVL_NOTE, "Function `%s' added to category `%s'.",
-            fun->pathname, cat_name);
-
         fibril_rwlock_read_unlock(&device_tree.rwlock);
         fun_del_ref(fun);
-
-        async_answer_0(callid, EOK);
+        
+        async_answer_0(callid, rc);
 }