AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Input: w90p910_keypad - move a dereference below a NULL test

Browse Source 
We should first check whether platform data is NULL or not, before
dereferencing it to get the keymap.

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Julia Lawall 2009-08-30 11:30:48 -07:00 committed by Dmitry Torokhov
parent 9d8340687c
commit 903b9124ea
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/keyboard/w90p910_keypad.c
View File

@ -120,7 +120,7 @@ static int __devinit w90p910_keypad_probe(struct platform_device *pdev)
{ {
const struct w90p910_keypad_platform_data *pdata = const struct w90p910_keypad_platform_data *pdata =
pdev->dev.platform_data; 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 w90p910_keypad *keypad;
struct input_dev *input_dev; struct input_dev *input_dev;
struct resource *res; struct resource *res;
@ -132,6 +132,8 @@ static int __devinit w90p910_keypad_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
keymap_data = pdata->keymap_data;
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "failed to get keypad irq\n"); dev_err(&pdev->dev, "failed to get keypad irq\n");