Changeset 95c675b in mainline for uspace/drv/char/ps2mouse/ps2mouse.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (1 diff)

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -116 +116 @@
 {
         mouse->client_sess = NULL;
-        mouse->parent_sess = ddf_dev_parent_sess_create(dev);
+        mouse->parent_sess = ddf_dev_parent_sess_get(dev);
         if (!mouse->parent_sess)
                 return ENOMEM;