Changeset f278930 in mainline for uspace/srv/devman/main.c

Timestamp:

2011-09-03T12:02:08Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7fff38c1

Parents:

f480d7e

Message:

ISA bridge remove support.

File:

• uspace/srv/devman/main.c (modified) (2 diffs)

uspace/srv/devman/main.c

@@ -320 +320 @@
                         fibril_rwlock_write_unlock(&device_tree.rwlock);
                         
-                        rc = driver_dev_remove(&device_tree, dev);
-                        if (rc != EOK) {
-                                dev_del_ref(dev);
-                                return ENOTSUP;
+                        /* If device is owned by driver, ask driver to give it up. */
+                        if (dev->state == DEVICE_USABLE) {
+                                rc = driver_dev_remove(&device_tree, dev);
+                                if (rc != EOK) {
+                                        dev_del_ref(dev);
+                                        return ENOTSUP;
+                                }
                         }
                         
@@ -332 +335 @@
                                 return EIO;
                         }
+                        driver_t *driver = dev->drv;
                         fibril_rwlock_read_unlock(&device_tree.rwlock);
                         
-                        detach_driver(&device_tree, dev);
+                        if (driver)
+                                detach_driver(&device_tree, dev);
                         
                         fibril_rwlock_write_lock(&device_tree.rwlock);