Changeset 07457d6 in mainline

Timestamp:

2018-01-29T06:22:20Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

14d789c, 2752620b, a5f7b269

Parents:

03cfe2ec (diff), b8ab299 (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:

Jakub Jermář <jakub@…> (2018-01-29 06:22:20)

git-committer:

GitHub <noreply@…> (2018-01-29 06:22:20)

Message:

Merge pull request #17 from Aearsis/master

libdrv: fix leaking ddf_dev_t reference

File:

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

uspace/lib/drv/generic/driver.c

@@ -196 +196 @@
                 rc = ENOTSUP;
         
-        if (rc == EOK)
+        if (rc == EOK) {
+                fibril_mutex_lock(&devices_mutex);
+                list_remove(&dev->link);
+                fibril_mutex_unlock(&devices_mutex);
                 dev_del_ref(dev);
-        
+        }
+        
+        dev_del_ref(dev);
         async_answer_0(iid, rc);
 }
@@ -224 +229 @@
                 rc = ENOTSUP;
         
-        if (rc == EOK)
+        if (rc == EOK) {
+                fibril_mutex_lock(&devices_mutex);
+                list_remove(&dev->link);
+                fibril_mutex_unlock(&devices_mutex);
                 dev_del_ref(dev);
-        
+        }
+        
+        dev_del_ref(dev);
         async_answer_0(iid, rc);
 }