diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-06-08 08:35:37 +0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-09 00:16:11 +0200 |
| commit | ff2b7ac6f6c58b0011d9d73004fb6e396f514018 (patch) | |
| tree | 303de9ac1aad6192f1af84a460de39a98500cf3d /drivers/mfd/max77693.c | |
| parent | 8b7353d17542b2a513aa62a9856215e99ddb8403 (diff) | |
| download | linux-stable-ff2b7ac6f6c58b0011d9d73004fb6e396f514018.tar.gz linux-stable-ff2b7ac6f6c58b0011d9d73004fb6e396f514018.tar.bz2 linux-stable-ff2b7ac6f6c58b0011d9d73004fb6e396f514018.zip | |
mfd: Fix max77693 irq leak and wrong kfree call
We need to call max77693_irq_exit() in max77693_i2c_probe error patch and
max77693_i2c_remove.
Current code already uses devm_kzalloc() to allocate memory for max77693.
Thus we should not call kfree(max77693), otherwise we got double free.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/max77693.c')
| -rw-r--r-- | drivers/mfd/max77693.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c index 8eed0c47ade6..a1811cb50ec7 100644 --- a/drivers/mfd/max77693.c +++ b/drivers/mfd/max77693.c @@ -154,7 +154,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c, ret = max77693_irq_init(max77693); if (ret < 0) - goto err_mfd; + goto err_irq; pm_runtime_set_active(max77693->dev); @@ -168,11 +168,11 @@ static int max77693_i2c_probe(struct i2c_client *i2c, return ret; err_mfd: + max77693_irq_exit(max77693); +err_irq: i2c_unregister_device(max77693->muic); i2c_unregister_device(max77693->haptic); err_regmap: - kfree(max77693); - return ret; } @@ -181,6 +181,7 @@ static int max77693_i2c_remove(struct i2c_client *i2c) struct max77693_dev *max77693 = i2c_get_clientdata(i2c); mfd_remove_devices(max77693->dev); + max77693_irq_exit(max77693); i2c_unregister_device(max77693->muic); i2c_unregister_device(max77693->haptic); |