From 11b87826876f3657e4f4f840a36b31aca834a925 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sun, 30 Aug 2009 11:30:48 -0700 Subject: [PATCH] --- yaml --- r: 161292 b: refs/heads/master c: 903b9124eae00edf8a9d6491dab60fcda777aabd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/w90p910_keypad.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cdecc1056af0..a176b7926a52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d8340687c524ce61e3c9c76758c4c81303acfc0 +refs/heads/master: 903b9124eae00edf8a9d6491dab60fcda777aabd diff --git a/trunk/drivers/input/keyboard/w90p910_keypad.c b/trunk/drivers/input/keyboard/w90p910_keypad.c index 2d03dd0f9e07..6032def03707 100644 --- a/trunk/drivers/input/keyboard/w90p910_keypad.c +++ b/trunk/drivers/input/keyboard/w90p910_keypad.c @@ -120,7 +120,7 @@ static int __devinit w90p910_keypad_probe(struct platform_device *pdev) { const struct w90p910_keypad_platform_data *pdata = pdev->dev.platform_data; - const struct matrix_keymap_data *keymap_data = pdata->keymap_data; + const struct matrix_keymap_data *keymap_data; struct w90p910_keypad *keypad; struct input_dev *input_dev; struct resource *res; @@ -132,6 +132,8 @@ static int __devinit w90p910_keypad_probe(struct platform_device *pdev) return -EINVAL; } + keymap_data = pdata->keymap_data; + irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(&pdev->dev, "failed to get keypad irq\n");