Merge tag 'clk-for-linus-3.16-part2' of git://git.linaro.org/people/mike.turquette...

[firefly-linux-kernel-4.4.55.git] / drivers / macintosh / windfarm_pm121.c

diff --git a/drivers/macintosh/windfarm_pm121.c b/drivers/macintosh/windfarm_pm121.c
index 7fe58b0ae8b4713a5cc135cf914160fc0e9e9883..b350fb86ff08c93f9bc11c43d642d4c3feed765d 100644 (file)
--- a/drivers/macintosh/windfarm_pm121.c
+++ b/drivers/macintosh/windfarm_pm121.c
@@ -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);