Changeset 4f87a85a in mainline for uspace/drv/time

Timestamp:

2018-12-10T14:29:35Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ca4c5596

Parents:

433d52f

git-author:

Jiri Svoboda <jiri@…> (2018-12-10 07:39:07)

git-committer:

Jiri Svoboda <jiri@…> (2018-12-10 14:29:35)

Message:

Check return code from ddf_add_fun_to_category

File:

• uspace/drv/time/cmos-rtc/cmos-rtc.c (modified) (4 diffs)

uspace/drv/time/cmos-rtc/cmos-rtc.c

@@ -588 +588 @@
         errno_t rc;
         bool need_cleanup = false;
+        bool bound = false;
 
         ddf_msg(LVL_DEBUG, "rtc_dev_add %s (handle = %d)",
@@ -624 +625 @@
         }
 
+        bound = true;
         rtc->fun = fun;
 
-        ddf_fun_add_to_category(fun, "clock");
+        rc = ddf_fun_add_to_category(fun, "clock");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding service to clock category.");
+                goto error;
+        }
 
         ddf_msg(LVL_NOTE, "Device %s successfully initialized",
@@ -634 +640 @@
 
 error:
+        if (bound)
+                ddf_fun_unbind(fun);
         if (fun)
                 ddf_fun_destroy(fun);
@@ -754 +762 @@
 
         rc = ddf_fun_online(fun);
-        if (rc == EOK)
-                ddf_fun_add_to_category(fun, "clock");
+        if (rc == EOK) {
+                // XXX This should be probably handled by the framework
+                rc = ddf_fun_add_to_category(fun, "clock");
+        }
 
         return rc;