Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef8dee5c authored by Mark Brown's avatar Mark Brown Committed by Dmitry Torokhov
Browse files

Input: wm831x-ts - convert to devm_kzalloc() 



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

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 2f7badb9

drivers/input/touchscreen/wm831x-ts.c

+2 −3
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev) 
	if (core_pdata)

		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();

	if (!wm831x_ts || !input_dev) {

		error = -ENOMEM;
@@ -376,7 +377,6 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev) 
	free_irq(wm831x_ts->data_irq, wm831x_ts);

err_alloc:

	input_free_device(input_dev);

	kfree(wm831x_ts);



	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->data_irq, wm831x_ts);

	input_unregister_device(wm831x_ts->input_dev);

	kfree(wm831x_ts);



	return 0;

}