diff --git a/[refs] b/[refs] index b96899a7ba9d..1becf868e467 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7eb6c5e8e5e1e96c36763778e9a78b9da6fcd31 +refs/heads/master: dc7e412d431db5da7fa252f4c3ed475ef4af3e8a diff --git a/trunk/drivers/mfd/tps65910.c b/trunk/drivers/mfd/tps65910.c index 837f0e6fbf0e..0226cdea2b47 100644 --- a/trunk/drivers/mfd/tps65910.c +++ b/trunk/drivers/mfd/tps65910.c @@ -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; @@ -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; }