mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
Input: w90p910_keypad - move a dereference below a NULL test
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:
parent
9d8340687c
commit
903b9124ea
1 changed files with 3 additions and 1 deletions
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue