pm2301_charger: Fix NULL pointer dereference

[karo-tx-linux.git] / drivers / power / pm2301_charger.c

diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index a44175139bbf3a619d65fe611cc9fa961388cd76..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;
        }
 
@@ -1269,5 +1274,5 @@ module_exit(pm2xxx_charger_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay");
-MODULE_ALIAS("platform:pm2xxx-charger");
+MODULE_ALIAS("i2c:pm2xxx-charger");
 MODULE_DESCRIPTION("PM2xxx charger management driver");