Changeset 7a68fe5 in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-10-10T06:58:55Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ea6392

Parents:

e68c834 (diff), 80099c19 (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.

Message:

Merge with mainline

File:

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

uspace/srv/devman/devman.c

@@ -794 +794 @@
         case EOK:
                 dev->state = DEVICE_USABLE;
+                exch = async_exchange_begin(drv->sess);
+                async_msg_1(exch, DRIVER_DEV_ADDED, dev->handle);
+                async_exchange_end(exch);
                 break;
         case ENOENT:
@@ -1066 +1069 @@
         
         link = hash_table_find(&tree->devman_devices, &key);
+        if (link == NULL)
+                return NULL;
+        
         return hash_table_get_instance(link, dev_node_t, devman_dev);
 }