[POWERPC] windfarm: don't die on suspend thread signal

When the windfarm thread gets a suspend signal it will die instead of
freezing. This fixes it.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index e947af982f93..94c117ef20c1 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -94,8 +94,6 @@ static int wf_thread_func(void *data)
         DBG("wf: thread started\n");
 
         while(!kthread_should_stop()) {
-                try_to_freeze();
-
                 if (time_after_eq(jiffies, next)) {
                         wf_notify(WF_EVENT_TICK, NULL);
                         if (wf_overtemp) {
@@ -118,8 +116,8 @@ static int wf_thread_func(void *data)
                 if (delay <= HZ)
                         schedule_timeout_interruptible(delay);
 
-                /* there should be no signal, but oh well */
-                if (signal_pending(current)) {
+                /* there should be no non-suspend signal, but oh well */
+                if (signal_pending(current) && !try_to_freeze()) {
                         printk(KERN_WARNING "windfarm: thread got sigl !\n");
                         break;
                 }