xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-3.4-testing] ns16550: Do not re-init active timer o

from [Xen patchbot-3.4-testing]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-3.4-testing] ns16550: Do not re-init active timer on S3 resume.
From:	"Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>
Date:	Wed, 24 Mar 2010 04:31:01 -0700
Delivery-date:	Wed, 24 Mar 2010 04:31:47 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-3.4-testing] ns16550: Do not re-init active timer on S3 resume., Xen patchbot-3.4-testing <=

Previous by Date:	[Xen-changelog] [xen-3.4-testing] Fix a race condition for cpufreq dbs timer while S3 resuming, Xen patchbot-3.4-testing
Next by Date:	[Xen-changelog] [xen-3.4-testing] x86_32: Relocate multiboot modules to below 1GB., Xen patchbot-3.4-testing
Previous by Thread:	[Xen-changelog] [xen-3.4-testing] Fix a race condition for cpufreq dbs timer while S3 resuming, Xen patchbot-3.4-testing
Next by Thread:	[Xen-changelog] [xen-3.4-testing] x86_32: Relocate multiboot modules to below 1GB., Xen patchbot-3.4-testing
Indexes:	[Date] [Thread] [Top] [All Lists]