From b5536dbae128dee108b537d07ff272a8c7b33f07 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 7 Jan 2013 10:25:04 +0530
Subject: [PATCH] --- yaml --- r: 354758 b: refs/heads/master c:
 699cbd6726ed9124ce014471aaaa28e8c7f7122e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dbc2889a4be4..eece8a9e843a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e32a9f8f34cc5eaf77100cd2d54e78e81d01f5dc
+refs/heads/master: 699cbd6726ed9124ce014471aaaa28e8c7f7122e
diff --git a/trunk/drivers/tty/serial/imx.c b/trunk/drivers/tty/serial/imx.c
index 426253c2821d..9bec8a23687a 100644
--- a/trunk/drivers/tty/serial/imx.c
+++ b/trunk/drivers/tty/serial/imx.c
@@ -491,8 +491,7 @@ static irqreturn_t imx_txint(int irq, void *dev_id)
 	unsigned long flags;
 
 	spin_lock_irqsave(&sport->port.lock, flags);
-	if (sport->port.x_char)
-	{
+	if (sport->port.x_char) {
 		/* Send next char */
 		writel(sport->port.x_char, sport->port.membase + URTX0);
 		goto out;