Changeset db96017 in mainline for uspace/srv/devman/devman.c

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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 mainline changes.

File:

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

uspace/srv/devman/devman.c

@@ -800 +800 @@
         default:
                 dev->state = DEVICE_INVALID;
+                break;
         }
         
@@ -1066 +1067 @@
         
         link = hash_table_find(&tree->devman_devices, &key);
+        if (link == NULL)
+                return NULL;
+        
         return hash_table_get_instance(link, dev_node_t, devman_dev);
 }