leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: wm831x-ts - convert to devm_kzalloc()

Browse Source 
Saves a little code and eliminates the possibility of introducing some
leaks.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Mark Brown 2012-10-11 00:42:34 -07:00 committed by Dmitry Torokhov
parent 2f7badb974
commit ef8dee5cfe
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/input/touchscreen/wm831x-ts.c
View File

@ -245,7 +245,8 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev)
if (core_pdata) if (core_pdata)
pdata = core_pdata->touch; pdata = core_pdata->touch;
wm831x_ts = kzalloc(sizeof(struct wm831x_ts), GFP_KERNEL); wm831x_ts = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ts),
GFP_KERNEL);
input_dev = input_allocate_device(); input_dev = input_allocate_device();
if (!wm831x_ts || !input_dev) { if (!wm831x_ts || !input_dev) {
error = -ENOMEM; error = -ENOMEM;
@ -376,7 +377,6 @@ err_data_irq:
free_irq(wm831x_ts->data_irq, wm831x_ts); free_irq(wm831x_ts->data_irq, wm831x_ts);
err_alloc: err_alloc:
input_free_device(input_dev); input_free_device(input_dev);
kfree(wm831x_ts);
return error; return error;
} }
@ -388,7 +388,6 @@ static __devexit int wm831x_ts_remove(struct platform_device *pdev)
free_irq(wm831x_ts->pd_irq, wm831x_ts); free_irq(wm831x_ts->pd_irq, wm831x_ts);
free_irq(wm831x_ts->data_irq, wm831x_ts); free_irq(wm831x_ts->data_irq, wm831x_ts);
input_unregister_device(wm831x_ts->input_dev); input_unregister_device(wm831x_ts->input_dev);
kfree(wm831x_ts);
return 0; return 0;
} }