debuggers.hg

changeset 21094:81d9132ce00d

ns16550: Do not re-init active timer on S3 resume.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Mar 22 10:24:17 2010 +0000 (2010-03-22)
parents c5e1a0b720ba
children 4d3834df0483
files xen/drivers/char/ns16550.c
line diff
     1.1 --- a/xen/drivers/char/ns16550.c	Sat Mar 20 07:35:04 2010 +0000
     1.2 +++ b/xen/drivers/char/ns16550.c	Mon Mar 22 10:24:17 2010 +0000
     1.3 @@ -259,7 +259,9 @@ static void __devinit ns16550_init_posti
     1.4  
     1.5      serial_async_transmit(port);
     1.6  
     1.7 -    init_timer(&uart->timer, ns16550_poll, port, 0);
     1.8 +    if ( !uart->timer.function )
     1.9 +        init_timer(&uart->timer, ns16550_poll, port, 0);
    1.10 +
    1.11      /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */
    1.12      bits = uart->data_bits + uart->stop_bits + !!uart->parity;
    1.13      uart->timeout_ms = max_t(