---

yaml --- r: 338403 b: refs/heads/master c: 76cc438 h: refs/heads/master i: 338401: 02c91da 338399: 771fefc v: v3
git-mirror · Nov 1, 2012 · 6c242e2 · 6c242e2
1 parent 40a5679
commit 6c242e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);