pm2301_charger: Fix NULL pointer dereference

Add checking pl_data in probe, this prevent possible NULL pointer
dereference. Also fix NULL pointer deference in dev_err when allocate
memory for pm2 fails.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>

diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index fef56e2041b325cf9e086d434f1755fbca0a8857..bb346becd7b4fa12fb603e5a88077cad3bc1a763 100644 (file)
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -1007,9 +1007,14 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
        u8 val;
        int i;
 
+       if (!pl_data) {
+               dev_err(&i2c_client->dev, "No platform data supplied\n");
+               return -EINVAL;
+       }
+
        pm2 = kzalloc(sizeof(struct pm2xxx_charger), GFP_KERNEL);
        if (!pm2) {
-               dev_err(pm2->dev, "pm2xxx_charger allocation failed\n");
+               dev_err(&i2c_client->dev, "pm2xxx_charger allocation failed\n");
                return -ENOMEM;
        }