Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df311333 authored by Axel Lin's avatar Axel Lin Committed by Anton Vorontsov
Browse files

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: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
parent 17b4565b

drivers/power/pm2301_charger.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

	}