Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 24 Aug 2020 06:37:28 -0700
From:   Guenter Roeck <linux@roeck-us.net>
To:     Dinghao Liu <dinghao.liu@zju.edu.cn>
Cc:     kjlu@umn.edu, Wim Van Sebroeck <wim@linux-watchdog.org>,
        Krzysztof Sobota <krzysztof.sobota@nokia.com>,
        Alexander Sverdlin <alexander.sverdlin@nokia.com>,
        linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] [v2] watchdog: Use put_device on error
Message-ID: <20200824133728.GC192024@roeck-us.net>
References: <20200824031230.31050-1-dinghao.liu@zju.edu.cn>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200824031230.31050-1-dinghao.liu@zju.edu.cn>
User-Agent: Mutt/1.9.4 (2018-02-28)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Aug 24, 2020 at 11:12:30AM +0800, Dinghao Liu wrote:
> We should use put_device() instead of freeing device
> directly after device_initialize().
> 
> Fixes: cb36e29bb0e4b ("watchdog: initialize device before misc_register")
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> 
> Changelog:
> 
> v2: - Use put_device() instead of just removing kfree.
>       Move the memleak part to a separate patch.
> ---
>  drivers/watchdog/watchdog_dev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
> index 6798addabd5a..b0fa7f31b1b6 100644
> --- a/drivers/watchdog/watchdog_dev.c
> +++ b/drivers/watchdog/watchdog_dev.c
> @@ -1021,7 +1021,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
>  				pr_err("%s: a legacy watchdog module is probably present.\n",
>  					wdd->info->identity);
>  			old_wd_data = NULL;
> -			kfree(wd_data);
> +			put_device(&wd_data->dev);
>  			return err;
>  		}
>  	}
> -- 
> 2.17.1
>