commit 8f74c0661c42104b3e3d2c032bc61efde15360ad · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Input: twl4030_keypad - avoid potential NULL-pointer dereference

Signed-off-by: Shubhrajyoti D <a0393217@india.ti.com>
Acked-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by Shubhrajyoti D and committed by Dmitry Torokhov 15 years ago 8f74c066 e28e1d93

+1 -1

1 changed file

expand all

unified split

drivers

input

keyboard

twl4030_keypad.c

+1 -1

drivers/input/keyboard/twl4030_keypad.c

··· 338 u8 reg; 339 int error; 340 341 - if (!pdata || !pdata->rows || !pdata->cols || 342 pdata->rows > TWL4030_MAX_ROWS || pdata->cols > TWL4030_MAX_COLS) { 343 dev_err(&pdev->dev, "Invalid platform_data\n"); 344 return -EINVAL;

··· 338 u8 reg; 339 int error; 340 341 + if (!pdata || !pdata->rows || !pdata->cols || !pdata->keymap_data || 342 pdata->rows > TWL4030_MAX_ROWS || pdata->cols > TWL4030_MAX_COLS) { 343 dev_err(&pdev->dev, "Invalid platform_data\n"); 344 return -EINVAL;