From 13972becd773a2e738ed1add278b2d788a7449ff Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 9 May 2012 15:49:57 +0900
Subject: [PATCH] --- yaml --- r: 304223 b: refs/heads/master c:
 94e792ab66d696aad2e52c91bae4cfbeefe4c9f6 h: refs/heads/master i:   304221:
 4328952f0b045dd88203b54eb545a49fdb6c0b31   304219:
 4b99c49c79205f7a1a45ebeb53171891a865be90   304215:
 fecb188926a9c658b480d6194d961bbd820a3054   304207:
 09259e5e8dca77b7698340e22a0c5925875bbcee   304191:
 c88454474eacddfadd46cde6b332c4b7984353b5 v: v3

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

diff --git a/[refs] b/[refs]
index f461a5687c72..18da0edb4b50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 642180871bc91afebb6ccf40d1615a7dd33699a3
+refs/heads/master: 94e792ab66d696aad2e52c91bae4cfbeefe4c9f6
diff --git a/trunk/drivers/tty/serial/8250/8250_em.c b/trunk/drivers/tty/serial/8250/8250_em.c
index ff4254249bd8..be6c28937ecc 100644
--- a/trunk/drivers/tty/serial/8250/8250_em.c
+++ b/trunk/drivers/tty/serial/8250/8250_em.c
@@ -110,8 +110,9 @@ static int __devinit serial8250_em_probe(struct platform_device *pdev)
 	}
 
 	priv->sclk = clk_get(&pdev->dev, "sclk");
-	if (!priv->sclk) {
+	if (IS_ERR(priv->sclk)) {
 		dev_err(&pdev->dev, "unable to get clock\n");
+		ret = PTR_ERR(priv->sclk);
 		goto err1;
 	}