Changeset 7715994 in mainline for kernel/genarch/src/drivers/i8042/i8042.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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:

• kernel/genarch/src/drivers/i8042/i8042.c (modified) (1 diff)

kernel/genarch/src/drivers/i8042/i8042.c

@@ -67 +67 @@
         i8042_instance_t *instance = irq->instance;
         i8042_t *dev = instance->i8042;
-        uint8_t status;
         
-        if (((status = pio_read_8(&dev->status)) & i8042_BUFFER_FULL_MASK)) {
+        if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) {
                 uint8_t data = pio_read_8(&dev->data);
                 indev_push_character(instance->kbrdin, data);