1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 18130f11238e..eacb588a9345 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -46,6 +46,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/rational.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -119,7 +120,8 @@
 #define  MX2_UCR3_RXDMUXSEL      (1<<2)  /* RXD Muxed Input Select, on mx2/mx3 */
 #define  UCR3_INVT       (1<<1)  /* Inverted Infrared transmission */
 #define  UCR3_BPEN       (1<<0)  /* Preset registers enable */
-#define  UCR4_CTSTL_32   (32<<10) /* CTS trigger level (32 chars) */
+#define  UCR4_CTSTL_SHF  10      /* CTS trigger level shift */
+#define  UCR4_CTSTL_MASK 0x3F    /* CTS trigger is 6 bits wide */
 #define  UCR4_INVR       (1<<9)  /* Inverted infrared reception */
 #define  UCR4_ENIRI      (1<<8)  /* Serial infrared interrupt enable */
 #define  UCR4_WKEN       (1<<7)  /* Wake interrupt enable */
@@ -440,7 +442,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
 
                 temp = readl(sport->port.membase + USR2);
                 if (temp & USR2_BRCD) {
-                        writel(temp | USR2_BRCD, sport->port.membase + USR2);
+                        writel(USR2_BRCD, sport->port.membase + USR2);
                         if (uart_handle_break(&sport->port))
                                 continue;
                 }
@@ -590,6 +592,9 @@ static int imx_setup_ufcr(struct imx_port *sport, unsigned int mode)
         return 0;
 }
 
+/* half the RX buffer size */
+#define CTSTL 16
+
 static int imx_startup(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
@@ -606,6 +611,10 @@ static int imx_startup(struct uart_port *port)
         if (USE_IRDA(sport))
                 temp |= UCR4_IRSC;
 
+        /* set the trigger level for CTS */
+        temp &= ~(UCR4_CTSTL_MASK<<  UCR4_CTSTL_SHF);
+        temp |= CTSTL<<  UCR4_CTSTL_SHF;
+
         writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
 
         if (USE_IRDA(sport)) {
@@ -1088,7 +1097,7 @@ imx_console_get_options(struct imx_port *sport, int *baud,
                            int *parity, int *bits)
 {
 
-        if ( readl(sport->port.membase + UCR1) | UCR1_UARTEN ) {
+        if (readl(sport->port.membase + UCR1) & UCR1_UARTEN) {
                 /* ok, the port was enabled */
                 unsigned int ucr2, ubir,ubmr, uartclk;
                 unsigned int baud_raw;
@@ -1279,7 +1288,7 @@ static int serial_imx_probe(struct platform_device *pdev)
                 sport->use_irda = 1;
 #endif
 
-        if (pdata->init) {
+        if (pdata && pdata->init) {
                 ret = pdata->init(pdev);
                 if (ret)
                         goto clkput;
@@ -1292,7 +1301,7 @@ static int serial_imx_probe(struct platform_device *pdev)
 
         return 0;
 deinit:
-        if (pdata->exit)
+        if (pdata && pdata->exit)
                 pdata->exit(pdev);
 clkput:
         clk_put(sport->clk);
@@ -1321,7 +1330,7 @@ static int serial_imx_remove(struct platform_device *pdev)
 
         clk_disable(sport->clk);
 
-        if (pdata->exit)
+        if (pdata && pdata->exit)
                 pdata->exit(pdev);
 
         iounmap(sport->port.membase);