Changeset ca62f86 in mainline for uspace/drv/infrastructure/root/root.c

Timestamp:

2013-09-09T17:52:40Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

f7bb6d1

Parents:

6ad185d (diff), a1ecb88 (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.

File:

• uspace/drv/infrastructure/root/root.c (modified) (1 diff)

uspace/drv/infrastructure/root/root.c

@@ -208 +208 @@
         /*
          * Register virtual devices root.
-         * We ignore error occurrence because virtual devices shall not be
+         * We warn on error occurrence because virtual devices shall not be
          * vital for the system.
          */
-        (void) add_virtual_root_fun(dev);
+        int res = add_virtual_root_fun(dev);
+        if (res != EOK)
+                ddf_msg(LVL_WARN, "Failed to add virtual child.");
 
         /* Register root device's children. */
-        int res = add_platform_fun(dev);
+        res = add_platform_fun(dev);
         if (EOK != res)
                 ddf_msg(LVL_ERROR, "Failed adding child device for platform.");