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

Commit 677df0c9 authored by Jesper Juhl's avatar Jesper Juhl Committed by Samuel Ortiz
Browse files

mfd: Do not leak init_data in tps65912_device_init() 



We neglect to free init_data on successful exit.  I also moved two
assignments to just before they are needed.  This avoids doing them in
case we hit an earlier error exit from the function.

Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Cc: Margarita Olaya Cabrera <magi@slimlogic.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 2f8491d3

drivers/mfd/tps65912-core.c

+3 −3
Original line number Diff line number Diff line
@@ -131,9 +131,6 @@ int tps65912_device_init(struct tps65912 *tps65912) 
	if (init_data == NULL)

		return -ENOMEM;



	init_data->irq = pmic_plat_data->irq;

	init_data->irq_base = pmic_plat_data->irq;



	mutex_init(&tps65912->io_mutex);

	dev_set_drvdata(tps65912->dev, tps65912);
@@ -153,10 +150,13 @@ int tps65912_device_init(struct tps65912 *tps65912) 
	if (ret < 0)

		goto err;



	init_data->irq = pmic_plat_data->irq;

	init_data->irq_base = pmic_plat_data->irq;

	ret = tps65912_irq_init(tps65912, init_data->irq, init_data);

	if (ret < 0)

		goto err;



	kfree(init_data);

	return ret;



err: