From: Jean Guyader Date: Wed, 9 Dec 2009 20:36:50 +0000 (+0000) Subject: cope-with-dead-serial: Fix compile. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9dfa6ed1a5017e18d64d8b28dc6082f3149afbad;p=xenclient%2Fxen-pq.git cope-with-dead-serial: Fix compile. --- diff --git a/master/cope-with-dead-serial b/master/cope-with-dead-serial index 069bcf7..53ce969 100644 --- a/master/cope-with-dead-serial +++ b/master/cope-with-dead-serial @@ -1,5 +1,5 @@ diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c -index 60c373b..4fc1a86 100644 +index 5fdfd91..9387944 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -127,8 +127,9 @@ static void ns16550_interrupt( @@ -26,7 +26,7 @@ index 60c373b..4fc1a86 100644 - if ( ns_read_reg(uart, LSR) & LSR_THRE ) + bail=0; -+ if (( ns_read_reg(uart, LSR) & LSR_THRE && (bail++ < 0x10)) ++ if (( ns_read_reg(uart, LSR) & LSR_THRE) && (bail++ < 0x10)) serial_tx_interrupt(port, regs); set_timer(&uart->timer, NOW() + MILLISECS(uart->timeout_ms));