[PATCH] thermal: return an error on failure to register thermal class

[PATCH] thermal: return an error on failure to register thermal class

[Richard Guy Briggs]

The return code from the registration of the thermal class is used to
unallocate resources, but this failure isn't passed back to the caller of
thermal_init.  Return this failure back to the caller.

This bug was introduced in changeset 4cb18728 which overwrote the return code
when the variable was re-used to catch the return code of the registration of
the genetlink thermal socket family.

Signed-off-by: Richard Guy Briggs <rbriggs@redhat.com>
---
 drivers/thermal/thermal_sys.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 8c8ce80..bfbf9fb 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1807,6 +1807,7 @@ static int __init thermal_init(void)
 		idr_destroy(&thermal_cdev_idr);
 		mutex_destroy(&thermal_idr_lock);
 		mutex_destroy(&thermal_list_lock);
+		return result;
 	}
 	result = genetlink_init();
 	return result;
-- 
1.8.0.2

Re: [PATCH] thermal: return an error on failure to register thermal class

[Zhang Rui]

On Tue, 2013-02-12 at 14:39 -0500, Richard Guy Briggs wrote:
> The return code from the registration of the thermal class is used to
> unallocate resources, but this failure isn't passed back to the caller of
> thermal_init.  Return this failure back to the caller.
> 
> This bug was introduced in changeset 4cb18728 which overwrote the return code
> when the variable was re-used to catch the return code of the registration of
> the genetlink thermal socket family.
> 
> Signed-off-by: Richard Guy Briggs <rbriggs@redhat.com>

applied to thermal  -next.

thanks,
rui
> ---
>  drivers/thermal/thermal_sys.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
> index 8c8ce80..bfbf9fb 100644
> --- a/drivers/thermal/thermal_sys.c
> +++ b/drivers/thermal/thermal_sys.c
> @@ -1807,6 +1807,7 @@ static int __init thermal_init(void)
>  		idr_destroy(&thermal_cdev_idr);
>  		mutex_destroy(&thermal_idr_lock);
>  		mutex_destroy(&thermal_list_lock);
> +		return result;
>  	}
>  	result = genetlink_init();
>  	return result;