Re: [PATCH -next] watchdog: core: Fix error handling of watchdog_dev_init()

[Guenter Roeck <linux@roeck-us.net>]

On 07/19/2016 04:22 AM, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Fix the error handling paths of watchdog_dev_init().
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

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

> ---
>   drivers/watchdog/watchdog_dev.c | 11 ++++++++---
>   1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
> index 14f8a92..f6e6751 100644
> --- a/drivers/watchdog/watchdog_dev.c
> +++ b/drivers/watchdog/watchdog_dev.c
> @@ -952,17 +952,22 @@ int __init watchdog_dev_init(void)
>   	err = class_register(&watchdog_class);
>   	if (err < 0) {
>   		pr_err("couldn't register class\n");
> -		return err;
> +		goto err_register;
>   	}
>
>   	err = alloc_chrdev_region(&watchdog_devt, 0, MAX_DOGS, "watchdog");
>   	if (err < 0) {
>   		pr_err("watchdog: unable to allocate char dev region\n");
> -		class_unregister(&watchdog_class);
> -		return err;
> +		goto err_alloc;
>   	}
>
>   	return 0;
> +
> +err_alloc:
> +	class_unregister(&watchdog_class);
> +err_register:
> +	destroy_workqueue(watchdog_wq);
> +	return err;
>   }
>
>   /*
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>