From 6c242e29fab03dcca79c1d0303aba84367ce2bed Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 1 Nov 2012 13:27:34 +0800
Subject: [PATCH] --- yaml --- r: 338403 b: refs/heads/master c:
 76cc43868c1e9d6344ad6c4992c4f6abd5204a8f h: refs/heads/master i:   338401:
 02c91daa9814d7ae36b408c4671214bdabd9783a   338399:
 771fefc2134fd2bc20ef647e057bb49b93e6c828 v: v3

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

diff --git a/[refs] b/[refs]
index 916defe56ace..5059fc7d0cf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31fe99048859b13a87f476016e7bb5c2b5220c36
+refs/heads/master: 76cc43868c1e9d6344ad6c4992c4f6abd5204a8f
diff --git a/trunk/drivers/tty/serial/of_serial.c b/trunk/drivers/tty/serial/of_serial.c
index 533ccfe77094..b9fdccb22590 100644
--- a/trunk/drivers/tty/serial/of_serial.c
+++ b/trunk/drivers/tty/serial/of_serial.c
@@ -66,10 +66,10 @@ static int __devinit of_platform_serial_setup(struct platform_device *ofdev,
 
 		/* Get clk rate through clk driver if present */
 		info->clk = clk_get(&ofdev->dev, NULL);
-		if (info->clk == NULL) {
+		if (IS_ERR(info->clk)) {
 			dev_warn(&ofdev->dev,
 				"clk or clock-frequency not defined\n");
-			return -ENODEV;
+			return PTR_ERR(info->clk);
 		}
 
 		clk_prepare_enable(info->clk);