Changeset 4f87a85a in mainline for uspace/drv/char

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

Location:

uspace/drv/char

Files:

• msim-con/msim-con.c (modified) (3 diffs)
• ns8250/ns8250.c (modified) (3 diffs)
• ski-con/ski-con.c (modified) (1 diff)
• sun4v-con/sun4v-con.c (modified) (3 diffs)

uspace/drv/char/msim-con/msim-con.c

@@ -85 +85 @@
         irq_cmd_t *msim_cmds = NULL;
         errno_t rc;
+        bool bound = false;
 
         circ_buf_init(&con->cbuf, con->buf, msim_con_buf_size, 1);
@@ -143 +144 @@
         }
 
-        ddf_fun_add_to_category(fun, "console");
+        bound = true;
+
+        rc = ddf_fun_add_to_category(fun, "console");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error adding function 'a' to category "
+                    "'console'.");
+                goto error;
+        }
 
         return EOK;
@@ -149 +157 @@
         if (CAP_HANDLE_VALID(con->irq_handle))
                 async_irq_unsubscribe(con->irq_handle);
+        if (bound)
+                ddf_fun_unbind(fun);
         if (fun != NULL)
                 ddf_fun_destroy(fun);

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);

uspace/drv/char/ski-con/ski-con.c

@@ -112 +112 @@
         }
 
-        ddf_fun_add_to_category(fun, "console");
-
         bound = true;
+
+        rc = ddf_fun_add_to_category(fun, "console");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error adding function 'a' to category "
+                    "'console'.");
+                goto error;
+        }
 
         fid = fibril_create(ski_con_fibril, con);

uspace/drv/char/sun4v-con/sun4v-con.c

@@ -74 +74 @@
         ddf_fun_t *fun = NULL;
         errno_t rc;
+        bool bound = false;
 
         con->res = *res;
@@ -113 +114 @@
         }
 
-        ddf_fun_add_to_category(fun, "console");
+        bound = true;
+
+        rc = ddf_fun_add_to_category(fun, "console");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error adding function 'a' to category "
+                    "'console'.");
+                goto error;
+        }
 
         return EOK;
@@ -122 +130 @@
         if (con->output_buffer != (niagara_output_buffer_t *) AS_AREA_ANY)
                 physmem_unmap((void *) con->output_buffer);
+
+        if (bound)
+                ddf_fun_unbind(fun);
 
         if (fun != NULL)