diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /drivers/macintosh | |
parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) |
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>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/macio-adb.c | 1 | ||||
-rw-r--r-- | drivers/macintosh/smu.c | 4 | ||||
-rw-r--r-- | drivers/macintosh/therm_adt746x.c | 2 | ||||
-rw-r--r-- | drivers/macintosh/windfarm_pm81.c | 8 | ||||
-rw-r--r-- | drivers/macintosh/windfarm_pm91.c | 9 |
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c index 79119f56e82..bd6da7a9c55 100644 --- a/drivers/macintosh/macio-adb.c +++ b/drivers/macintosh/macio-adb.c | |||
@@ -155,6 +155,7 @@ static int macio_adb_reset_bus(void) | |||
155 | while ((in_8(&adb->ctrl.r) & ADB_RST) != 0) { | 155 | while ((in_8(&adb->ctrl.r) & ADB_RST) != 0) { |
156 | if (--timeout == 0) { | 156 | if (--timeout == 0) { |
157 | out_8(&adb->ctrl.r, in_8(&adb->ctrl.r) & ~ADB_RST); | 157 | out_8(&adb->ctrl.r, in_8(&adb->ctrl.r) & ~ADB_RST); |
158 | spin_unlock_irqrestore(&macio_lock, flags); | ||
158 | return -1; | 159 | return -1; |
159 | } | 160 | } |
160 | } | 161 | } |
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index ef1f3330a10..2506c957712 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, | |||
1186 | return -EOVERFLOW; | 1186 | return -EOVERFLOW; |
1187 | spin_lock_irqsave(&pp->lock, flags); | 1187 | spin_lock_irqsave(&pp->lock, flags); |
1188 | if (pp->cmd.status == 1) { | 1188 | if (pp->cmd.status == 1) { |
1189 | if (file->f_flags & O_NONBLOCK) | 1189 | if (file->f_flags & O_NONBLOCK) { |
1190 | spin_unlock_irqrestore(&pp->lock, flags); | ||
1190 | return -EAGAIN; | 1191 | return -EAGAIN; |
1192 | } | ||
1191 | add_wait_queue(&pp->wait, &wait); | 1193 | add_wait_queue(&pp->wait, &wait); |
1192 | for (;;) { | 1194 | for (;;) { |
1193 | set_current_state(TASK_INTERRUPTIBLE); | 1195 | set_current_state(TASK_INTERRUPTIBLE); |
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index c42eeb43042..16d82f17ae8 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
@@ -182,6 +182,7 @@ remove_thermostat(struct i2c_client *client) | |||
182 | 182 | ||
183 | thermostat = NULL; | 183 | thermostat = NULL; |
184 | 184 | ||
185 | i2c_set_clientdata(client, NULL); | ||
185 | kfree(th); | 186 | kfree(th); |
186 | 187 | ||
187 | return 0; | 188 | return 0; |
@@ -399,6 +400,7 @@ static int probe_thermostat(struct i2c_client *client, | |||
399 | rc = read_reg(th, CONFIG_REG); | 400 | rc = read_reg(th, CONFIG_REG); |
400 | if (rc < 0) { | 401 | if (rc < 0) { |
401 | dev_err(&client->dev, "Thermostat failed to read config!\n"); | 402 | dev_err(&client->dev, "Thermostat failed to read config!\n"); |
403 | i2c_set_clientdata(client, NULL); | ||
402 | kfree(th); | 404 | kfree(th); |
403 | return -ENODEV; | 405 | return -ENODEV; |
404 | } | 406 | } |
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c index 565d5b2adc9..749d174b0dc 100644 --- a/drivers/macintosh/windfarm_pm81.c +++ b/drivers/macintosh/windfarm_pm81.c | |||
@@ -188,7 +188,7 @@ struct wf_smu_sys_fans_state { | |||
188 | }; | 188 | }; |
189 | 189 | ||
190 | /* | 190 | /* |
191 | * Configs for SMU Sytem Fan control loop | 191 | * Configs for SMU System Fan control loop |
192 | */ | 192 | */ |
193 | static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { | 193 | static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { |
194 | /* Model ID 2 */ | 194 | /* Model ID 2 */ |
@@ -757,10 +757,8 @@ static int __devexit wf_smu_remove(struct platform_device *ddev) | |||
757 | wf_put_control(cpufreq_clamp); | 757 | wf_put_control(cpufreq_clamp); |
758 | 758 | ||
759 | /* Destroy control loops state structures */ | 759 | /* Destroy control loops state structures */ |
760 | if (wf_smu_sys_fans) | 760 | kfree(wf_smu_sys_fans); |
761 | kfree(wf_smu_sys_fans); | 761 | kfree(wf_smu_cpu_fans); |
762 | if (wf_smu_cpu_fans) | ||
763 | kfree(wf_smu_cpu_fans); | ||
764 | 762 | ||
765 | return 0; | 763 | return 0; |
766 | } | 764 | } |
diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c index bea99168ff3..34427323512 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) | |||
687 | wf_put_control(cpufreq_clamp); | 687 | wf_put_control(cpufreq_clamp); |
688 | 688 | ||
689 | /* Destroy control loops state structures */ | 689 | /* Destroy control loops state structures */ |
690 | if (wf_smu_slots_fans) | 690 | kfree(wf_smu_slots_fans); |
691 | kfree(wf_smu_cpu_fans); | 691 | kfree(wf_smu_drive_fans); |
692 | if (wf_smu_drive_fans) | 692 | kfree(wf_smu_cpu_fans); |
693 | kfree(wf_smu_cpu_fans); | ||
694 | if (wf_smu_cpu_fans) | ||
695 | kfree(wf_smu_cpu_fans); | ||
696 | 693 | ||
697 | return 0; | 694 | return 0; |
698 | } | 695 | } |