macintosh/windfarm_pm121.c: Fix for possible null pointer dereference

There is otherwise a risk of a possible null pointer dereference.

Was largely found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Rickard Strandqvist 2014-05-17 19:20:57 +02:00 committed by Benjamin Herrenschmidt
parent 1efc563865
commit bd0c30e310

View File

@ -555,8 +555,18 @@ static void pm121_create_sys_fans(int loop_id)
pid_param.interval = PM121_SYS_INTERVAL;
pid_param.history_len = PM121_SYS_HISTORY_SIZE;
pid_param.itarget = param->itarget;
pid_param.min = control->ops->get_min(control);
pid_param.max = control->ops->get_max(control);
if(control)
{
pid_param.min = control->ops->get_min(control);
pid_param.max = control->ops->get_max(control);
} else {
/*
* This is probably not the right!?
* Perhaps goto fail if control == NULL above?
*/
pid_param.min = 0;
pid_param.max = 0;
}
wf_pid_init(&pm121_sys_state[loop_id]->pid, &pid_param);
@ -571,7 +581,7 @@ static void pm121_create_sys_fans(int loop_id)
control the same control */
printk(KERN_WARNING "pm121: failed to set up %s loop "
"setting \"%s\" to max speed.\n",
loop_names[loop_id], control->name);
loop_names[loop_id], control ? control->name : "uninitialized value");
if (control)
wf_control_set_max(control);