Skip to content

Commit

Permalink
mfd: Don't leak init_data in tps65910_i2c_probe
Browse files Browse the repository at this point in the history
There are a couple of situations where we leak init_data in
drivers/mfd/tps65910.c:tps65910_i2c_probe() - this patch should take
care of them.

Signed-off-by: Jesper Juhl <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
  • Loading branch information
jjuhl authored and Samuel Ortiz committed Jul 31, 2011
1 parent f7eb6c5 commit dc7e412
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/mfd/tps65910.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,10 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
init_data->irq_base = pmic_plat_data->irq;

tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL);
if (tps65910 == NULL)
if (tps65910 == NULL) {
kfree(init_data);
return -ENOMEM;
}

i2c_set_clientdata(i2c, tps65910);
tps65910->dev = &i2c->dev;
Expand All @@ -174,11 +176,13 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
if (ret < 0)
goto err;

kfree(init_data);
return ret;

err:
mfd_remove_devices(tps65910->dev);
kfree(tps65910);
kfree(init_data);
return ret;
}

Expand Down

0 comments on commit dc7e412

Please sign in to comment.