diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2010-03-20 15:12:54 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-05-28 01:37:28 +0200 |
| commit | f322d5f0097333343bfd92b47258ee997c889263 (patch) | |
| tree | d6f0d4b0e0f6e6a8fa778a73c740916ca5616dd2 /drivers/mfd/menelaus.c | |
| parent | d84027bc4d176a0c06e8f62a9f7a002bdd444012 (diff) | |
| download | linux-f322d5f0097333343bfd92b47258ee997c889263.tar.gz linux-f322d5f0097333343bfd92b47258ee997c889263.tar.bz2 linux-f322d5f0097333343bfd92b47258ee997c889263.zip | |
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: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/menelaus.c')
| -rw-r--r-- | drivers/mfd/menelaus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index a94b131a18ef..721948be12c7 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1228,6 +1228,7 @@ fail2: 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; } |