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

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1269429493 0
# Node ID ce43eb89b253c0946027f9dec4d0aa211ba71219
# Parent  458b7bd1267459be204e85cdab716ca109085fbc
ns16550: Do not re-init active timer on S3 resume.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   21048:81d9132ce00d
xen-unstable date:        Mon Mar 22 10:24:17 2010 +0000
---
 xen/drivers/char/ns16550.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -r 458b7bd12674 -r ce43eb89b253 xen/drivers/char/ns16550.c
--- a/xen/drivers/char/ns16550.c        Wed Mar 24 11:16:58 2010 +0000
+++ b/xen/drivers/char/ns16550.c        Wed Mar 24 11:18:13 2010 +0000
@@ -257,7 +257,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