Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

2 files changed, 15 insertions, 4 deletions

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 23b4a3b28dbc..4eab93aa570b 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1257,7 +1257,8 @@ static unsigned int smu_fpoll(struct file *file, poll_table *wait)
                 if (pp->busy && pp->cmd.status != 1)
                         mask |= POLLIN;
                 spin_unlock_irqrestore(&pp->lock, flags);
-        } if (pp->mode == smu_file_events) {
+        }
+        if (pp->mode == smu_file_events) {
                 /* Not yet implemented */
         }
         return mask;
diff --git a/drivers/macintosh/windfarm_pm121.c b/drivers/macintosh/windfarm_pm121.c
index 7fe58b0ae8b4..b350fb86ff08 100644
--- 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);