Changeset b800b0e in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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/drv/char/i8042/i8042.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -302 +302 @@
         const bool enabled = hw_res_enable_interrupt(parent_sess);
         if (!enabled) {
-                log_msg(LVL_ERROR, "Failed to enable interrupts: %s.",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable interrupts: %s.",
                     ddf_dev_get_name(ddf_dev));
                 rc = EIO;