diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 19:45:24 +0200 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 19:45:24 +0200 |
commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /drivers/input/misc/pcf8574_keypad.c | |
parent | arch/tile: catch up on various minor cleanups. (diff) | |
parent | Linux 2.6.35-rc4 (diff) | |
download | linux-a2262d8a231e92742651859a10c9a4430a5e899a.tar.xz linux-a2262d8a231e92742651859a10c9a4430a5e899a.zip |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/input/misc/pcf8574_keypad.c')
-rw-r--r-- | drivers/input/misc/pcf8574_keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c index 0ac47d2898ec..4b42ffc0532a 100644 --- a/drivers/input/misc/pcf8574_keypad.c +++ b/drivers/input/misc/pcf8574_keypad.c @@ -69,7 +69,7 @@ static irqreturn_t pcf8574_kp_irq_handler(int irq, void *dev_id) unsigned char nextstate = read_state(lp); if (lp->laststate != nextstate) { - int key_down = nextstate <= ARRAY_SIZE(lp->btncode); + int key_down = nextstate < ARRAY_SIZE(lp->btncode); unsigned short keycode = key_down ? lp->btncode[nextstate] : lp->btncode[lp->laststate]; |