diff options
| author | Shubhrajyoti D <a0393217@india.ti.com> | 2011-04-06 15:31:22 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-04-06 15:32:10 -0700 |
| commit | 8f74c0661c42104b3e3d2c032bc61efde15360ad (patch) | |
| tree | e11f7384eb3191e338bc56d5edd220f8dad24802 | |
| parent | e28e1d93e9591d21e440f5210a9b4317c59445df (diff) | |
| download | linux-8f74c0661c42104b3e3d2c032bc61efde15360ad.tar.gz linux-8f74c0661c42104b3e3d2c032bc61efde15360ad.tar.bz2 linux-8f74c0661c42104b3e3d2c032bc61efde15360ad.zip | |
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>
| -rw-r--r-- | drivers/input/keyboard/twl4030_keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c index 09bef79d9da1..cc06c4b2f920 100644 --- 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; |