projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[linux-2.6-block.git]
/
drivers
/
input
/
keyboard
/
cros_ec_keyb.c
diff --git
a/drivers/input/keyboard/cros_ec_keyb.c
b/drivers/input/keyboard/cros_ec_keyb.c
index 72d3499bb0290c7a0d68c9be116752569a50ad78..5d773d20230a2b73101e8a9a370bf0c29139ab87 100644
(file)
--- a/
drivers/input/keyboard/cros_ec_keyb.c
+++ b/
drivers/input/keyboard/cros_ec_keyb.c
@@
-157,7
+157,7
@@
static int cros_ec_keyb_get_state(struct cros_ec_keyb *ckdev, uint8_t *kb_state)
.insize = ckdev->cols,
};
- return c
kdev->ec->
cmd_xfer(ckdev->ec, &msg);
+ return c
ros_ec_
cmd_xfer(ckdev->ec, &msg);
}
static irqreturn_t cros_ec_keyb_irq(int irq, void *data)