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

Commit f322d5f0 authored by Wolfram Sang's avatar Wolfram Sang Committed by Samuel Ortiz
Browse files

mfd: Fix dangling pointers 



Fix I2C-drivers which missed setting clientdata to NULL before freeing the
structure it points to. Also fix drivers which do this _after_ the structure
was freed already.

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent d84027bc

drivers/mfd/88pm860x-i2c.c

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static int __devexit pm860x_remove(struct i2c_client *client) 
	i2c_unregister_device(chip->companion);

	i2c_set_clientdata(chip->companion, NULL);

	i2c_set_clientdata(chip->client, NULL);

	i2c_set_clientdata(client, NULL);

	kfree(chip);

	return 0;

}

drivers/mfd/ab3100-core.c

+2 −0
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ static int __init ab3100_probe(struct i2c_client *client, 
	i2c_unregister_device(ab3100->testreg_client);

 exit_no_testreg_client:

 exit_no_detect:

	i2c_set_clientdata(client, NULL);

	kfree(ab3100);

	return err;

}
@@ -941,6 +942,7 @@ static int __exit ab3100_remove(struct i2c_client *client) 
	 * their notifiers so deactivate IRQ

	 */

	free_irq(client->irq, ab3100);

	i2c_set_clientdata(client, NULL);

	kfree(ab3100);

	return 0;

}

drivers/mfd/da903x.c

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ static int __devexit da903x_remove(struct i2c_client *client) 
	struct da903x_chip *chip = i2c_get_clientdata(client);



	da903x_remove_subdevs(chip);

	i2c_set_clientdata(client, NULL);

	kfree(chip);

	return 0;

}

drivers/mfd/menelaus.c

+2 −1
Original line number Diff line number Diff line
@@ -1228,6 +1228,7 @@ static int menelaus_probe(struct i2c_client *client, 
	free_irq(client->irq, menelaus);

	flush_scheduled_work();

fail1:

	i2c_set_clientdata(client, NULL);

	kfree(menelaus);

	return err;

}
@@ -1237,8 +1238,8 @@ static int __exit menelaus_remove(struct i2c_client *client) 
	struct menelaus_chip	*menelaus = i2c_get_clientdata(client);



	free_irq(client->irq, menelaus);

	kfree(menelaus);

	i2c_set_clientdata(client, NULL);

	kfree(menelaus);

	the_menelaus = NULL;

	return 0;

}

drivers/mfd/pcf50633-core.c

+1 −0
Original line number Diff line number Diff line
@@ -679,6 +679,7 @@ static int __devexit pcf50633_remove(struct i2c_client *client) 
	for (i = 0; i < PCF50633_NUM_REGULATORS; i++)

		platform_device_unregister(pcf->regulator_pdev[i]);



	i2c_set_clientdata(client, NULL);

	kfree(pcf);



	return 0;