Changeset 4f87a85a in mainline for uspace/drv/block

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

Files:

• ata_bd/main.c (modified) (3 diffs)
• ddisk/ddisk.c (modified) (2 diffs)
• usbmast/main.c (modified) (3 diffs)

uspace/drv/block/ata_bd/main.c

@@ -162 +162 @@
         ddf_fun_t *fun = NULL;
         ata_fun_t *afun = NULL;
+        bool bound = false;
 
         fun_name = ata_fun_name(disk);
@@ -202 +203 @@
         }
 
-        ddf_fun_add_to_category(fun, "disk");
+        bound = true;
+
+        rc = ddf_fun_add_to_category(fun, "disk");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function %s to "
+                    "category 'disk': %s", fun_name, str_error(rc));
+                goto error;
+        }
 
         free(fun_name);
@@ -208 +216 @@
         return EOK;
 error:
+        if (bound)
+                ddf_fun_unbind(fun);
         if (fun != NULL)
                 ddf_fun_destroy(fun);

uspace/drv/block/ddisk/ddisk.c

@@ -319 +319 @@
         errno_t rc;
         ddf_fun_t *fun = NULL;
+        bool bound = false;
 
         fun = ddf_fun_create(ddisk->dev, fun_exposed, DDISK_FUN_NAME);
@@ -337 +338 @@
         }
 
-        ddf_fun_add_to_category(fun, "disk");
+        bound = true;
+
+        rc = ddf_fun_add_to_category(fun, "disk");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function %s to category "
+                    "'disk': %s.\n", DDISK_FUN_NAME, str_error(rc));
+                goto error;
+        }
         ddisk->fun = fun;
 
         return EOK;
 error:
+        if (bound)
+                ddf_fun_unbind(fun);
         if (fun != NULL)
                 ddf_fun_destroy(fun);

uspace/drv/block/usbmast/main.c

@@ -223 +223 @@
         ddf_fun_t *fun = NULL;
         usbmast_fun_t *mfun = NULL;
+        bool bound = false;
 
         if (asprintf(&fun_name, "l%u", lun) < 0) {
@@ -299 +300 @@
         }
 
-        ddf_fun_add_to_category(fun, "disk");
+        bound = true;
+
+        rc = ddf_fun_add_to_category(fun, "disk");
+        if (rc != EOK) {
+                usb_log_error("Failed to add function %s to category 'disk': %s.",
+                    fun_name, str_error(rc));
+                goto error;
+        }
 
         free(fun_name);
@@ -308 +316 @@
         /* Error cleanup */
 error:
+        if (bound)
+                ddf_fun_unbind(fun);
         if (fun != NULL)
                 ddf_fun_destroy(fun);