Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

5 files changed, 12 insertions, 12 deletions

diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 79119f56e82d..bd6da7a9c55b 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -155,6 +155,7 @@ static int macio_adb_reset_bus(void)
         while ((in_8(&adb->ctrl.r) & ADB_RST) != 0) {
                 if (--timeout == 0) {
                         out_8(&adb->ctrl.r, in_8(&adb->ctrl.r) & ~ADB_RST);
+                        spin_unlock_irqrestore(&macio_lock, flags);
                         return -1;
                 }
         }
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index ef1f3330a10e..2506c957712e 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1186,8 +1186,10 @@ static ssize_t smu_read_command(struct file *file, struct smu_private *pp,
                 return -EOVERFLOW;
         spin_lock_irqsave(&pp->lock, flags);
         if (pp->cmd.status == 1) {
-                if (file->f_flags & O_NONBLOCK)
+                if (file->f_flags & O_NONBLOCK) {
+                        spin_unlock_irqrestore(&pp->lock, flags);
                         return -EAGAIN;
+                }
                 add_wait_queue(&pp->wait, &wait);
                 for (;;) {
                         set_current_state(TASK_INTERRUPTIBLE);
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index c42eeb43042d..16d82f17ae82 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -182,6 +182,7 @@ remove_thermostat(struct i2c_client *client)
 
         thermostat = NULL;
 
+        i2c_set_clientdata(client, NULL);
         kfree(th);
 
         return 0;
@@ -399,6 +400,7 @@ static int probe_thermostat(struct i2c_client *client,
         rc = read_reg(th, CONFIG_REG);
         if (rc < 0) {
                 dev_err(&client->dev, "Thermostat failed to read config!\n");
+                i2c_set_clientdata(client, NULL);
                 kfree(th);
                 return -ENODEV;
         }
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index 565d5b2adc95..749d174b0dc6 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -188,7 +188,7 @@ struct wf_smu_sys_fans_state {
 };
 
 /*
- * Configs for SMU Sytem Fan control loop
+ * Configs for SMU System Fan control loop
  */
 static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
         /* Model ID 2 */
@@ -757,10 +757,8 @@ static int __devexit wf_smu_remove(struct platform_device *ddev)
                 wf_put_control(cpufreq_clamp);
 
         /* Destroy control loops state structures */
-        if (wf_smu_sys_fans)
-                kfree(wf_smu_sys_fans);
-        if (wf_smu_cpu_fans)
-                kfree(wf_smu_cpu_fans);
+        kfree(wf_smu_sys_fans);
+        kfree(wf_smu_cpu_fans);
 
         return 0;
 }
diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c
index bea99168ff35..344273235124 100644
--- a/drivers/macintosh/windfarm_pm91.c
+++ b/drivers/macintosh/windfarm_pm91.c
@@ -687,12 +687,9 @@ static int __devexit wf_smu_remove(struct platform_device *ddev)
                 wf_put_control(cpufreq_clamp);
 
         /* Destroy control loops state structures */
-        if (wf_smu_slots_fans)
-                kfree(wf_smu_cpu_fans);
-        if (wf_smu_drive_fans)
-                kfree(wf_smu_cpu_fans);
-        if (wf_smu_cpu_fans)
-                kfree(wf_smu_cpu_fans);
+        kfree(wf_smu_slots_fans);
+        kfree(wf_smu_drive_fans);
+        kfree(wf_smu_cpu_fans);
 
         return 0;
 }