Changeset 4f87a85a in mainline for uspace/drv/intctl

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/intctl

Files:

• apic/apic.c (modified) (3 diffs)
• i8259/i8259.c (modified) (3 diffs)
• icp-ic/icp-ic.c (modified) (2 diffs)
• obio/obio.c (modified) (2 diffs)

uspace/drv/intctl/apic/apic.c

@@ -212 +212 @@
         void *regs;
         errno_t rc;
+        bool bound = false;
 
         if ((sysinfo_get_value("apic", &have_apic) != EOK) || (!have_apic)) {
@@ -241 +242 @@
         }
 
+        bound = true;
+
         rc = ddf_fun_add_to_category(fun_a, "irc");
         if (rc != EOK)
@@ -247 +250 @@
         return EOK;
 error:
+        if (bound)
+                ddf_fun_unbind(fun_a);
         if (fun_a != NULL)
                 ddf_fun_destroy(fun_a);

uspace/drv/intctl/i8259/i8259.c

@@ -142 +142 @@
         ddf_fun_t *fun_a = NULL;
         errno_t rc;
+        bool bound = false;
 
         if ((sysinfo_get_value("i8259", &have_i8259) != EOK) || (!have_i8259)) {
@@ -174 +175 @@
         }
 
+        bound = true;
+
         rc = ddf_fun_add_to_category(fun_a, "irc");
         if (rc != EOK)
@@ -180 +183 @@
         return EOK;
 error:
+        if (bound)
+                ddf_fun_unbind(fun_a);
         if (fun_a != NULL)
                 ddf_fun_destroy(fun_a);

uspace/drv/intctl/icp-ic/icp-ic.c

@@ -116 +116 @@
         void *regs;
         errno_t rc;
+        bool bound = false;
 
         rc = pio_enable((void *)res->base, sizeof(icpic_regs_t), &regs);
@@ -146 +147 @@
         return EOK;
 error:
+        if (bound)
+                ddf_fun_unbind(fun_a);
         if (fun_a != NULL)
                 ddf_fun_destroy(fun_a);

uspace/drv/intctl/obio/obio.c

@@ -118 +118 @@
         ddf_fun_t *fun_a = NULL;
         errno_t rc;
+        bool bound = false;
 
         rc = pio_enable((void *)res->base, OBIO_SIZE, (void **) &obio->regs);
@@ -149 +150 @@
         return EOK;
 error:
+        if (bound)
+                ddf_fun_unbind(fun_a);
         if (fun_a != NULL)
                 ddf_fun_destroy(fun_a);