Changeset 9df0f64 in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2018-11-27T16:50:40Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e199ab3

Parents:

b10e9367

git-author:

Jakub Jermar <jakub@…> (2018-11-22 20:05:37)

git-committer:

Jakub Jermar <jakub@…> (2018-11-27 16:50:40)

Message:

Fix function reference counting

After commit 498ced1, a function is created with an implicit reference.
Adding an extra reference for creation thus adds a reference that will
never be dropped and the function will be leaked.

This commit removes the extra reference.

File:

• uspace/lib/drv/generic/driver.c (modified) (2 diffs)

uspace/lib/drv/generic/driver.c

@@ -731 +731 @@
                 return NULL;
 
-        /* Add one reference that will be dropped by ddf_fun_destroy() */
         fun->dev = dev;
-        fun_add_ref(fun);
+        dev_add_ref(fun->dev);
 
         fun->bound = false;
@@ -741 +740 @@
                 fun->name = str_dup(name);
                 if (fun->name == NULL) {
-                        delete_function(fun);
+                        fun_del_ref(fun);       /* fun is destroyed */
                         return NULL;
                 }