diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-03-12 08:33:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-19 08:57:59 -0700 |
| commit | 90b7d65c8cba8830ede8307a21a76c8757eefa3a (patch) | |
| tree | b6daaefa90a96211283e74a533acad23e4ee0f85 /drivers/hwmon | |
| parent | baf9f08ae4a3e041e718b2e9843400faab15ccda (diff) | |
| download | kernel_samsung_smdk4412-90b7d65c8cba8830ede8307a21a76c8757eefa3a.zip kernel_samsung_smdk4412-90b7d65c8cba8830ede8307a21a76c8757eefa3a.tar.gz kernel_samsung_smdk4412-90b7d65c8cba8830ede8307a21a76c8757eefa3a.tar.bz2 | |
hwmon: (w83627ehf) Fix memory leak in probe function
commit 32260d94408c553dca4ce54104edf79941a27536 upstream.
The driver probe function leaked memory if creating the cpu0_vid attribute file
failed. Fix by converting the driver to use devm_kzalloc.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/w83627ehf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 685399b..e51b582 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c @@ -1823,7 +1823,8 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) goto exit; } - data = kzalloc(sizeof(struct w83627ehf_data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct w83627ehf_data), + GFP_KERNEL); if (!data) { err = -ENOMEM; goto exit_release; @@ -2319,9 +2320,8 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) exit_remove: w83627ehf_device_remove_files(dev); - kfree(data); - platform_set_drvdata(pdev, NULL); exit_release: + platform_set_drvdata(pdev, NULL); release_region(res->start, IOREGION_LENGTH); exit: return err; @@ -2335,7 +2335,6 @@ static int __devexit w83627ehf_remove(struct platform_device *pdev) w83627ehf_device_remove_files(&pdev->dev); release_region(data->addr, IOREGION_LENGTH); platform_set_drvdata(pdev, NULL); - kfree(data); return 0; } |