Re: [PATCH] hwmon: (ibmaem) don't call platform_device_del() if platform_device_add() fails

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

 



On Fri, Jul 01, 2022 at 03:41:53PM +0800, Yang Yingliang wrote:
> If platform_device_add() fails, it no need to call platform_device_del(), split
> platform_device_unregister() into platform_device_del/put(), so platform_device_put()
> can be called separately.
> 
> Fixes: 8808a793f052 ("ibmaem: new driver for power/energy/temp meters in IBM System X hardware")
> Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
> Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>

Applied.

Thanks,
Guenter

> ---
>  drivers/hwmon/ibmaem.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
> index 5c4cf742f5ae..157e232aace0 100644
> --- a/drivers/hwmon/ibmaem.c
> +++ b/drivers/hwmon/ibmaem.c
> @@ -550,7 +550,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
>  
>  	res = platform_device_add(data->pdev);
>  	if (res)
> -		goto ipmi_err;
> +		goto dev_add_err;
>  
>  	platform_set_drvdata(data->pdev, data);
>  
> @@ -598,7 +598,9 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
>  	ipmi_destroy_user(data->ipmi.user);
>  ipmi_err:
>  	platform_set_drvdata(data->pdev, NULL);
> -	platform_device_unregister(data->pdev);
> +	platform_device_del(data->pdev);
> +dev_add_err:
> +	platform_device_put(data->pdev);
>  dev_err:
>  	ida_free(&aem_ida, data->id);
>  id_err:
> @@ -690,7 +692,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
>  
>  	res = platform_device_add(data->pdev);
>  	if (res)
> -		goto ipmi_err;
> +		goto dev_add_err;
>  
>  	platform_set_drvdata(data->pdev, data);
>  
> @@ -738,7 +740,9 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
>  	ipmi_destroy_user(data->ipmi.user);
>  ipmi_err:
>  	platform_set_drvdata(data->pdev, NULL);
> -	platform_device_unregister(data->pdev);
> +	platform_device_del(data->pdev);
> +dev_add_err:
> +	platform_device_put(data->pdev);
>  dev_err:
>  	ida_free(&aem_ida, data->id);
>  id_err:



[Index of Archives]     [LM Sensors]     [Linux Sound]     [ALSA Users]     [ALSA Devel]     [Linux Audio Users]     [Linux Media]     [Kernel]     [Gimp]     [Yosemite News]     [Linux Media]

  Powered by Linux