From 6e2ada039b9e8fdab2d532d7de5b79bd554f3f82 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Mon, 19 Nov 2012 10:19:46 -0200
Subject: [PATCH] --- yaml --- r: 336980 b: refs/heads/master c:
 99ba2fd297ed475dc6782e9029d4da041a85706a h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/w1/masters/mxc_w1.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ec4666fdaf78..b70a6b83fd74 100644
--- 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
index 1cc61a700fa8..12c1ab844d80 100644
--- 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;
 	}