diff --git a/[refs] b/[refs]
index 953affa87d48..1c06ad7f9fd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59733ef7e510f6fd51a3dfc6f22ec1d3630a47b9
+refs/heads/master: fbbb9d9646f04768d0176f75e7fc93d29457b5db
diff --git a/trunk/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/trunk/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index 46edc649b0b7..7f6a1c7cb3de 100644
--- a/trunk/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/trunk/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -799,7 +799,7 @@ static void cpm_uart_init_scc(struct uart_cpm_port *pinfo)
 	cpm_set_scc_fcr(sup);
 
 	out_be16(&sup->scc_genscc.scc_mrblr, pinfo->rx_fifosize);
-	out_be16(&sup->scc_maxidl, pinfo->rx_fifosize);
+	out_be16(&sup->scc_maxidl, 0x10);
 	out_be16(&sup->scc_brkcr, 1);
 	out_be16(&sup->scc_parec, 0);
 	out_be16(&sup->scc_frmec, 0);
@@ -873,7 +873,7 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo)
 
 	/* Using idle character time requires some additional tuning.  */
 	out_be16(&up->smc_mrblr, pinfo->rx_fifosize);
-	out_be16(&up->smc_maxidl, pinfo->rx_fifosize);
+	out_be16(&up->smc_maxidl, 0x10);
 	out_be16(&up->smc_brklen, 0);
 	out_be16(&up->smc_brkec, 0);
 	out_be16(&up->smc_brkcr, 1);