projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e28e1d9)
Input: twl4030_keypad - avoid potential NULL-pointer dereference
authorShubhrajyoti D <a0393217@india.ti.com>
Wed, 6 Apr 2011 22:31:22 +0000 (15:31 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 6 Apr 2011 22:32:10 +0000 (15:32 -0700)
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>
drivers/input/keyboard/twl4030_keypad.c patch | blob | blame | history

diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index 09bef79d9da1c6e3aecd6efe40c0d4c4c900ba0b..cc06c4b2f920432edeeb4b0e3388872131ce10f9 100644 (file)
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -338,7 +338,7 @@ static int __devinit twl4030_kp_probe(struct platform_device *pdev)
        u8 reg;
        int error;
 
-       if (!pdata || !pdata->rows || !pdata->cols ||
+       if (!pdata || !pdata->rows || !pdata->cols || !pdata->keymap_data ||
            pdata->rows > TWL4030_MAX_ROWS || pdata->cols > TWL4030_MAX_COLS) {
                dev_err(&pdev->dev, "Invalid platform_data\n");
                return -EINVAL;