Re: [PATCH] Input: wm831x-on - Convert to devm_kzalloc()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> Saves a small amount of code and reduces the potential for leaks.

Shouldn't you still be kind and free the memory anyway?

M

> 
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/input/misc/wm831x-on.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/input/misc/wm831x-on.c
> b/drivers/input/misc/wm831x-on.c index 47f18d6..aee53fb 100644
> --- a/drivers/input/misc/wm831x-on.c
> +++ b/drivers/input/misc/wm831x-on.c
> @@ -76,7 +76,8 @@ static int __devinit wm831x_on_probe(struct
> platform_device *pdev) int irq = 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;
> @@ -120,7 +121,6 @@ err_irq:
>  err_input_dev:
>  	input_free_device(wm831x_on->dev);
>  err:
> -	kfree(wm831x_on);
>  	return ret;
>  }
> 
> @@ -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;
>  }
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media Devel]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Linux Wireless Networking]     [Linux Omap]

  Powered by Linux