On Tuesday 05 April 2011 03:28 PM, shubhrajyoti@xxxxxx wrote:
From: Shubhrajyoti D<a0393217@xxxxxxxxxxxx>
Signed-off-by: Shubhrajyoti D<a0393217@xxxxxxxxxxxx>
Axel's patch added changes to prevent NULL access if pdata is NULL
adding a check for keymap_data.
---
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 09bef79..cc06c4b 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
