Commit 58d1c9fd authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Rafael J. Wysocki
Browse files

thermal/core: Fix unregistering netlink at thermal init time 



The thermal subsystem initialization miss an netlink unregistering
function in the error. Add it.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 47e3f000

drivers/thermal/thermal_core.c

+3 −1
Original line number Diff line number Diff line
@@ -1607,7 +1607,7 @@ static int __init thermal_init(void) 


	result = thermal_register_governors();

	if (result)

		goto error;

		goto unregister_netlink;



	result = class_register(&thermal_class);

	if (result)
@@ -1622,6 +1622,8 @@ static int __init thermal_init(void) 


unregister_governors:

	thermal_unregister_governors();

unregister_netlink:

	thermal_netlink_exit();

error:

	ida_destroy(&thermal_tz_ida);

	ida_destroy(&thermal_cdev_ida);

drivers/thermal/thermal_netlink.c

+5 −0
Original line number Diff line number Diff line
@@ -699,3 +699,8 @@ int __init thermal_netlink_init(void) 
{

	return genl_register_family(&thermal_gnl_family);

}



void __init thermal_netlink_exit(void)

{

	genl_unregister_family(&thermal_gnl_family);

}

drivers/thermal/thermal_netlink.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ struct thermal_genl_cpu_caps { 
/* Netlink notification function */

#ifdef CONFIG_THERMAL_NETLINK

int __init thermal_netlink_init(void);

void __init thermal_netlink_exit(void);

int thermal_notify_tz_create(int tz_id, const char *name);

int thermal_notify_tz_delete(int tz_id);

int thermal_notify_tz_enable(int tz_id);
@@ -115,4 +116,6 @@ static inline int thermal_genl_cpu_capability_event(int count, struct thermal_ge 
	return 0;

}



static inline void __init thermal_netlink_exit(void) {}



#endif /* CONFIG_THERMAL_NETLINK */