---

yaml --- r: 360607 b: refs/heads/master c: 362ce5a h: refs/heads/master i: 360605: 72f7eb4 360603: 20dac06 360599: aae117a 360591: f59636e 360575: fb23d2e v: v3
git-mirror · Mar 1, 2013 · 9d71cea · 9d71cea
1 parent 8987d68
commit 9d71cea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6a1bcd3700a792d89999a7ec89a9303534ccefc
+refs/heads/master: 362ce5aeeb1b1828f91c2ca07327f72c24183ec9
diff --git a/trunk/drivers/watchdog/davinci_wdt.c b/trunk/drivers/watchdog/davinci_wdt.c
@@ -204,7 +204,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
 	int ret = 0, size;
 	struct device *dev = &pdev->dev;
 
-	wdt_clk = clk_get(dev, NULL);
+	wdt_clk = devm_clk_get(dev, NULL);
 	if (WARN_ON(IS_ERR(wdt_clk)))
 		return PTR_ERR(wdt_clk);
 
@@ -257,7 +257,6 @@ static int davinci_wdt_remove(struct platform_device *pdev)
 	}
 
 	clk_disable_unprepare(wdt_clk);
-	clk_put(wdt_clk);
 
 	return 0;
 }