]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Input: gpio-keys - fix possible NULL pointer dereference
authorUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Wed, 30 Jul 2008 14:33:43 +0000 (10:33 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 30 Jul 2008 14:40:35 +0000 (10:40 -0400)
bdata->button is used in gpio_check_button but never initialized.  Having a
device with debounce_interval != 0 without this patch resulted on an oops on
my machine.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/keyboard/gpio_keys.c

index be58730e636a4323c1aca62d136e94ec40700bcf..1a92f4b04c176d4af11a2631a549c790f8f170bf 100644 (file)
@@ -118,6 +118,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                unsigned int type = button->type ?: EV_KEY;
 
                bdata->input = input;
+               bdata->button = button;
                setup_timer(&bdata->timer,
                            gpio_check_button, (unsigned long)bdata);