Changeset ab936440 in mainline for uspace/drv/block/usbmast/main.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/drv/block/usbmast/main.c (modified) (3 diffs)

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