Skip to content

Commit

Permalink
Input: wm831x-on - convert to devm_kzalloc()
Browse files Browse the repository at this point in the history
Saves a small amount of code and reduces the potential for leaks.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Mark Brown authored and Dmitry Torokhov committed Oct 11, 2012
1 parent ef8dee5 commit dae6ba4
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/input/misc/wm831x-on.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ static int __devinit wm831x_on_probe(struct platform_device *pdev)
int irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0));
int ret;

wm831x_on = kzalloc(sizeof(struct wm831x_on), GFP_KERNEL);
wm831x_on = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_on),
GFP_KERNEL);
if (!wm831x_on) {
dev_err(&pdev->dev, "Can't allocate data\n");
return -ENOMEM;
Expand Down Expand Up @@ -120,7 +121,6 @@ static int __devinit wm831x_on_probe(struct platform_device *pdev)
err_input_dev:
input_free_device(wm831x_on->dev);
err:
kfree(wm831x_on);
return ret;
}

Expand All @@ -132,7 +132,6 @@ static int __devexit wm831x_on_remove(struct platform_device *pdev)
free_irq(irq, wm831x_on);
cancel_delayed_work_sync(&wm831x_on->work);
input_unregister_device(wm831x_on->dev);
kfree(wm831x_on);

return 0;
}
Expand Down

0 comments on commit dae6ba4

Please sign in to comment.