Changeset 6843a9c in mainline for uspace/srv/devman/devman.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

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:
@@ -803 +800 @@
         default:
                 dev->state = DEVICE_INVALID;
+                break;
         }