[Xen-changelog] [xen-unstable] ns16550: Do not re-init active timer on S3 resume.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1269253457 0
# Node ID 81d9132ce00d353c5a9d6850bfd902304f65b54a
# Parent  c5e1a0b720ba8e73953841aa883f48d061a216bd
ns16550: Do not re-init active timer on S3 resume.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/drivers/char/ns16550.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -r c5e1a0b720ba -r 81d9132ce00d xen/drivers/char/ns16550.c
--- a/xen/drivers/char/ns16550.c        Sat Mar 20 07:35:04 2010 +0000
+++ b/xen/drivers/char/ns16550.c        Mon Mar 22 10:24:17 2010 +0000
@@ -259,7 +259,9 @@ static void __devinit ns16550_init_posti
 
     serial_async_transmit(port);
 
-    init_timer(&uart->timer, ns16550_poll, port, 0);
+    if ( !uart->timer.function )
+        init_timer(&uart->timer, ns16550_poll, port, 0);
+
     /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */
     bits = uart->data_bits + uart->stop_bits + !!uart->parity;
     uart->timeout_ms = max_t(

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog