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

Timestamp:

2011-08-29T19:03:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c5be39b

Parents:

4d94002d

Message:

Make sure ddf_dev_t structure exists as long as any associated ddf_fun_t
structure.

File:

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

uspace/lib/drv/generic/driver.c

@@ -673 +673 @@
 }
 
-/** Increase function reference count. */
+/** Increase function reference count.
+ *
+ * This also increases reference count on the device. The device structure
+ * will thus not be deallocated while there are some associated function
+ * structures.
+ */
 static void fun_add_ref(ddf_fun_t *fun)
 {
+        dev_add_ref(fun->dev);
         atomic_inc(&fun->refcnt);
 }
@@ -685 +691 @@
 static void fun_del_ref(ddf_fun_t *fun)
 {
+        ddf_dev_t *dev = fun->dev;
+
         if (atomic_predec(&fun->refcnt) == 0)
                 delete_function(fun);
+
+        dev_del_ref(dev);
 }
 
@@ -721 +731 @@
 
         /* Add one reference that will be dropped by ddf_fun_destroy() */
+        fun->dev = dev;
         fun_add_ref(fun);
 
         fun->bound = false;
-        fun->dev = dev;
         fun->ftype = ftype;