diff options
| author | Julian Andres Klode <jak@jak-linux.org> | 2011-09-27 17:00:51 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-30 00:41:33 (GMT) |
| commit | 0cab4cb8526d7367c912c9a871d3ad1a9ac1fbf0 (patch) | |
| tree | dda540c0147ee39b3725f7a7bc438f039a2b3675 /drivers/staging/nvec/nvec_kbd.c | |
| parent | 8517e879e0d11a277275616b9e1c749afe2fceff (diff) | |
| download | linux-0cab4cb8526d7367c912c9a871d3ad1a9ac1fbf0.tar.xz | |
staging: nvec: Rewrite the interrupt handler
Rewrite the interrupt handler to use a state machine similar to
that found in the various kernels for the Advent Vega. This also
changes the code to use the new functions introduced in the
previous commits.
This also merges the rewrite sent in August 2011 by Marc
Dietrich, and thus also includes code by him. His original
patch can be found on the mailing list.
Signed-off-by: Julian Andres Klode <jak@jak-linux.org>
Acked-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/nvec/nvec_kbd.c')
| -rw-r--r-- | drivers/staging/nvec/nvec_kbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c index eaaafac..167eac0 100644 --- a/drivers/staging/nvec/nvec_kbd.c +++ b/drivers/staging/nvec/nvec_kbd.c @@ -41,7 +41,7 @@ static int nvec_keys_notifier(struct notifier_block *nb, unsigned char *msg = (unsigned char *)data; if (event_type == NVEC_KB_EVT) { - nvec_size _size = (msg[0] & (3 << 5)) >> 5; + int _size = (msg[0] & (3 << 5)) >> 5; /* power on/off button */ if (_size == NVEC_VAR_SIZE) |