Changeset ab936440 in mainline for uspace/drv/intctl/icp-ic/icp-ic.c

Timestamp:

2019-02-12T20:42:42Z (7 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/intctl/icp-ic/icp-ic.c (modified) (2 diffs)

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