From d55266f2f78b533e8a2bfb46e19e2d8b985e6f15 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Wed, 7 May 2008 13:50:19 -0600
Subject: [PATCH] mach-omap2/serial.c: fix minor bug and checkpatch warnings

omap_serial_init() in arch/arm/mach-omap2/serial.c clears the wrong
variable if it can't clk_get() a fclk - fix this.  Also fix some
checkpatch.pl warnings.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/serial.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 54ab7afab51..33a30e1108b 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -18,7 +18,7 @@
 #include <linux/serial_reg.h>
 #include <linux/clk.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <asm/arch/common.h>
 #include <asm/arch/board.h>
@@ -127,16 +127,15 @@ void __init omap_serial_init(void)
 		if (IS_ERR(uart_ick[i])) {
 			printk(KERN_ERR "Could not get uart%d_ick\n", i+1);
 			uart_ick[i] = NULL;
-		}
-		else
+		} else
 			clk_enable(uart_ick[i]);
+
 		sprintf(name, "uart%d_fck", i+1);
 		uart_fck[i] = clk_get(NULL, name);
 		if (IS_ERR(uart_fck[i])) {
 			printk(KERN_ERR "Could not get uart%d_fck\n", i+1);
-			uart_ick[i] = NULL;
-		}
-		else
+			uart_fck[i] = NULL;
+		} else
 			clk_enable(uart_fck[i]);
 
 		omap_serial_reset(p);
-- 
2.41.1