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)