Changeset 4f87a85a in mainline for uspace/drv/char/ns8250

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/char/ns8250/ns8250.c (modified) (3 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -829 +829 @@
         bool need_cleanup = false;
         bool need_unreg_intr_handler = false;
+        bool bound = false;
         errno_t rc;
 
@@ -909 +910 @@
         }
 
+        bound = true;
         ns->fun = fun;
 
-        ddf_fun_add_to_category(fun, "serial");
+        rc = ddf_fun_add_to_category(fun, "serial");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error adding function to category 'serial'.");
+                goto fail;
+        }
 
         ddf_msg(LVL_NOTE, "Device %s successfully initialized.",
@@ -918 +924 @@
         return EOK;
 fail:
+        if (bound)
+                ddf_fun_unbind(fun);
         if (fun != NULL)
                 ddf_fun_destroy(fun);