Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 903b9124 authored by Julia Lawall's avatar Julia Lawall Committed by Dmitry Torokhov
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 9d834068

drivers/input/keyboard/w90p910_keypad.c

+3 −1
Original line number Diff line number Diff line
@@ -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");