---

yaml --- r: 336980 b: refs/heads/master c: 99ba2fd h: refs/heads/master v: v3
git-mirror · Nov 21, 2012 · 6e2ada0 · 6e2ada0
1 parent 040e1cd
commit 6e2ada0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98c4514ff6e3072288770db66f91bdb15af8b433
+refs/heads/master: 99ba2fd297ed475dc6782e9029d4da041a85706a
diff --git a/trunk/drivers/w1/masters/mxc_w1.c b/trunk/drivers/w1/masters/mxc_w1.c
@@ -117,9 +117,9 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
 	if (!mdev)
 		return -ENOMEM;
 
-	mdev->clk = clk_get(&pdev->dev, "owire");
-	if (!mdev->clk) {
-		err = -ENODEV;
+	mdev->clk = clk_get(&pdev->dev, NULL);
+	if (IS_ERR(mdev->clk)) {
+		err = PTR_ERR(mdev->clk);
 		goto failed_clk;
 	}