diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-08-18 09:39:47 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-08-18 09:39:47 +0200 |
commit | a5dd19249607474ed680f16b4f5e8477d2b68689 (patch) | |
tree | 1aeeef053773c07bc02f3aa637febc80ceb96732 /drivers/input/joystick | |
parent | 6b7e26547fad7ace3dcb27a5babd2317fb9d1e12 (diff) | |
parent | 512255a2ad2c832ca7d4de9f31245f73781922d0 (diff) | |
download | op-kernel-dev-a5dd19249607474ed680f16b4f5e8477d2b68689.zip op-kernel-dev-a5dd19249607474ed680f16b4f5e8477d2b68689.tar.gz |
Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
Conflicts:
arch/x86/entry/entry_64_compat.S
arch/x86/math-emu/get_address.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r-- | drivers/input/joystick/turbografx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c index 27b6a3c..891797a 100644 --- a/drivers/input/joystick/turbografx.c +++ b/drivers/input/joystick/turbografx.c @@ -196,7 +196,7 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs) if (n_buttons[i] < 1) continue; - if (n_buttons[i] > 6) { + if (n_buttons[i] > ARRAY_SIZE(tgfx_buttons)) { printk(KERN_ERR "turbografx.c: Invalid number of buttons %d\n", n_buttons[i]); err = -EINVAL; goto err_unreg_devs; |