Changeset 95c675b in mainline for uspace/drv/char/i8042/main.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/i8042/main.c (modified) (2 diffs)

uspace/drv/char/i8042/main.c

@@ -35 +35 @@
  */
 
-#include <libarch/inttypes.h>
+#include <inttypes.h>
 #include <libarch/config.h>
 #include <ddf/driver.h>
@@ -60 +60 @@
         assert(dev);
         
-        async_sess_t *parent_sess = ddf_dev_parent_sess_create(dev);
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(dev);
         if (parent_sess == NULL)
                 return ENOMEM;