From 56f0f6afe24b137120a60ae4e6d1edd4e6e50a11 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 5 Apr 2010 22:29:09 -0700 Subject: [PATCH] --- yaml --- r: 189927 b: refs/heads/master c: 9d32c30542f9ecdb4b96a1a960924c9f403e3562 h: refs/heads/master i: 189925: 98d2b69105fe29746426c5538c4942b6732f19d3 189923: 2571f1f19d087b57bc368647dcf29fb6f7f30eb6 189919: c94e85534cc3045883cf75d01d0a7479a74a9ce3 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/matrix_keypad.c | 4 +++- trunk/include/linux/input/matrix_keypad.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7a7e83f2b76f..db169b556d97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e28d8eb68c12eab9c4a47b42ba993a6420d71d3 +refs/heads/master: 9d32c30542f9ecdb4b96a1a960924c9f403e3562 diff --git a/trunk/drivers/input/keyboard/matrix_keypad.c b/trunk/drivers/input/keyboard/matrix_keypad.c index d3c8b61a941d..f9d86cfb0db0 100644 --- a/trunk/drivers/input/keyboard/matrix_keypad.c +++ b/trunk/drivers/input/keyboard/matrix_keypad.c @@ -373,7 +373,9 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev) input_dev->name = pdev->name; input_dev->id.bustype = BUS_HOST; input_dev->dev.parent = &pdev->dev; - input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP); + input_dev->evbit[0] = BIT_MASK(EV_KEY); + if (!pdata->no_autorepeat) + input_dev->evbit[0] |= BIT_MASK(EV_REP); input_dev->open = matrix_keypad_start; input_dev->close = matrix_keypad_stop; diff --git a/trunk/include/linux/input/matrix_keypad.h b/trunk/include/linux/input/matrix_keypad.h index 3bd018baae20..c964cd7f436a 100644 --- a/trunk/include/linux/input/matrix_keypad.h +++ b/trunk/include/linux/input/matrix_keypad.h @@ -44,6 +44,7 @@ struct matrix_keymap_data { * @active_low: gpio polarity * @wakeup: controls whether the device should be set up as wakeup * source + * @no_autorepeat: disable key autorepeat * * This structure represents platform-specific data that use used by * matrix_keypad driver to perform proper initialization. @@ -64,6 +65,7 @@ struct matrix_keypad_platform_data { bool active_low; bool wakeup; + bool no_autorepeat; }; /**