From 14e2bbfa83011681bdfeab826a315fbca2138309 Mon Sep 17 00:00:00 2001
From: Lothar Wassmann <LW@KARO-electronics.de>
Date: Wed, 12 Oct 2005 19:58:11 +0100
Subject: [PATCH] --- yaml --- r: 9855 b: refs/heads/master c:
 e6158b4a5647624ceb90074bfcc248ea3152c906 h: refs/heads/master i:   9853:
 b6a5289edf8ed1997cfcd1fd820e6ecb7d548381   9851:
 e1c9f5765189abbbc4a51a3828e1f945baa0fd43   9847:
 7c0cc21a5deaac2a52a5fe19e6d76b5273e67cd7   9839:
 457e794068143f27b0b3a88f5a6087fac1f7e300   9823:
 0c96a73eda1c8d33aab7e4f1429344d575fb34b4   9791:
 c351826ea3c6ca9fdfae157adf818adad103b080   9727:
 9fd69630b0ff3461dda280121975f8b75c734709 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/serial/pxa.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4957b434a3b7..9f6379c9b5a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ec5e7f3656f0397b7e8b39a7dcc77937d187596
+refs/heads/master: e6158b4a5647624ceb90074bfcc248ea3152c906
diff --git a/trunk/drivers/serial/pxa.c b/trunk/drivers/serial/pxa.c
index 672b359b07ce..90c2a86c421b 100644
--- a/trunk/drivers/serial/pxa.c
+++ b/trunk/drivers/serial/pxa.c
@@ -499,7 +499,7 @@ serial_pxa_set_termios(struct uart_port *port, struct termios *termios,
 	/*
 	 * Update the per-port timeout.
 	 */
-	uart_update_timeout(port, termios->c_cflag, quot);
+	uart_update_timeout(port, termios->c_cflag, baud);
 
 	up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
 	if (termios->c_iflag & INPCK)