Merge branch 'for-linus' of git://neil.brown.name/md

[mv-sheeva.git] / drivers / macintosh / windfarm_pm91.c

diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c
index bea99168ff35c9366d43d0ad460b0989c2f2f225..344273235124e94aef27fec53d68f7b963b0059d 100644 (file)
--- 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;
 }