1 files changed, 10 insertions, 12 deletions

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 392154d13614..060ae9753923 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1070,7 +1070,7 @@ static void imx_disable_dma(struct imx_port *sport)
 static int imx_startup(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
-        int retval;
+        int retval, i;
         unsigned long flags, temp;
 
         retval = clk_prepare_enable(sport->clk_per);
@@ -1098,17 +1098,15 @@ static int imx_startup(struct uart_port *port)
 
         writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
 
-        if (USE_IRDA(sport)) {
-                /* reset fifo's and state machines */
-                int i = 100;
-                temp = readl(sport->port.membase + UCR2);
-                temp &= ~UCR2_SRST;
-                writel(temp, sport->port.membase + UCR2);
-                while (!(readl(sport->port.membase + UCR2) & UCR2_SRST) &&
-                    (--i > 0)) {
-                        udelay(1);
-                }
-        }
+        /* Reset fifo's and state machines */
+        i = 100;
+
+        temp = readl(sport->port.membase + UCR2);
+        temp &= ~UCR2_SRST;
+        writel(temp, sport->port.membase + UCR2);
+
+        while (!(readl(sport->port.membase + UCR2) & UCR2_SRST) && (--i > 0))
+                udelay(1);
 
         /*
          * Allocate the IRQ(s) i.MX1 has three interrupts whereas later