2 files changed, 9 insertions, 11 deletions

diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 516d943227e2..075b4d99e354 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -94,7 +94,9 @@ static int wf_thread_func(void *data)
         DBG("wf: thread started\n");
 
         set_freezable();
-        while(!kthread_should_stop()) {
+        while (!kthread_should_stop()) {
+                try_to_freeze();
+
                 if (time_after_eq(jiffies, next)) {
                         wf_notify(WF_EVENT_TICK, NULL);
                         if (wf_overtemp) {
@@ -116,12 +118,6 @@ static int wf_thread_func(void *data)
                 delay = next - jiffies;
                 if (delay <= HZ)
                         schedule_timeout_interruptible(delay);
-
-                /* 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;
-                }
         }
 
         DBG("wf: thread stopped\n");
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index dfef83f14960..a85f2d31a686 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -329,12 +329,14 @@ static struct uart_ops ulite_ops = {
 static void ulite_console_wait_tx(struct uart_port *port)
 {
         int i;
+        u8 val;
 
-        /* wait up to 10ms for the character(s) to be sent */
-        for (i = 0; i < 10000; i++) {
-                if (readb(port->membase + ULITE_STATUS) & ULITE_STATUS_TXEMPTY)
+        /* Spin waiting for TX fifo to have space available */
+        for (i = 0; i < 100000; i++) {
+                val = readb(port->membase + ULITE_STATUS);
+                if ((val & ULITE_STATUS_TXFULL) == 0)
                         break;
-                udelay(1);
+                cpu_relax();
         }
 }