Thermal: Tidy up error handling in powerclamp_init
PATCH 1/1 Thermal: Tidy up error handling in powerclamp_init
This patch
* adds missing kfree() for cpu_clamping_mask
* adds return value checking for alloc_percpu()
* unregister hotcpu notifier in exit path
Signed-off-by Durgadoss R <[email protected]>
--- drivers/thermal/intel_powerclamp.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/thermal/intel_powerclamp.c +21 -3
@@ -758,21 +758,39 @@ static int powerclamp_init(void)/* probe cpu features and ids here */ retval =powerclamp_probe ();if (retval) -return retval; + goto exit_free; +/* set default limit, maybe adjusted during runtime based on feedback */ window_size =2 ;register_hotcpu_notifier (&powerclamp_cpu_notifier); + powerclamp_thread = alloc_percpu(struct task_struct *); +if (!powerclamp_thread) { + retval = -ENOMEM ; + goto exit_unregister; + } + cooling_dev =thermal_cooling_device_register ("intel_powerclamp" ,NULL , &powerclamp_cooling_ops); -if (IS_ERR (cooling_dev)) -return -ENODEV ; +if (IS_ERR (cooling_dev)) { + retval = -ENODEV ; + goto exit_free_thread; + }if (!duration) duration =jiffies_to_msecs (DEFAULT_DURATION_JIFFIES ); +powerclamp_create_debug_files ();return 0 ; + +exit_free_thread: +free_percpu (powerclamp_thread); +exit_unregister: +unregister_hotcpu_notifier (&powerclamp_cpu_notifier); +exit_free: +kfree (cpu_clamping_mask); +return retval; }module_init (powerclamp_init);
Signature · 1 line
1.7.9.5
Quoted 4 lines · On Fri, 4 Oct 2013 21:53:24 +0530 Durgadoss R <[email protected]> wrote:
This patch
* adds missingkfree()forcpu_clamping_mask
* adds return value checking foralloc_percpu()
* unregister hotcpu notifier in exit path
looks good. thanks for the fix.
Jacob
Quoted 6 lines · Durgadoss R
This patch
* adds missingkfree()forcpu_clamping_mask
* adds return value checking foralloc_percpu()
* unregister hotcpu notifier in exit pathSigned-off-by Durgadoss R <[email protected]>
applied to thermal -next.
thanks,
rui
Quoted 51 lines
--- drivers/thermal/intel_powerclamp.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/thermal/intel_powerclamp.c +21
-3@@ -758,21 +758,39 @@ static int powerclamp_init(void)/* probe cpu features and ids here */ retval =powerclamp_probe ();if (retval) -return retval; + goto exit_free; +/* set default limit, maybe adjusted during runtime based on feedback */ window_size =2 ;register_hotcpu_notifier (&powerclamp_cpu_notifier); + powerclamp_thread = alloc_percpu(struct task_struct *); +if (!powerclamp_thread) { + retval = -ENOMEM ; + goto exit_unregister; + } + cooling_dev =thermal_cooling_device_register ("intel_powerclamp" ,NULL , &powerclamp_cooling_ops); -if (IS_ERR (cooling_dev)) -return -ENODEV ; +if (IS_ERR (cooling_dev)) { + retval = -ENODEV ; + goto exit_free_thread; + }if (!duration) duration =jiffies_to_msecs (DEFAULT_DURATION_JIFFIES ); +powerclamp_create_debug_files ();return 0 ; + +exit_free_thread: +free_percpu (powerclamp_thread); +exit_unregister: +unregister_hotcpu_notifier (&powerclamp_cpu_notifier); +exit_free: +kfree (cpu_clamping_mask); +return retval; }module_init (powerclamp_init);