---

yaml --- r: 339581 b: refs/heads/master c: 5a6a861 h: refs/heads/master i: 339579: cbf1a93 v: v3
git-mirror · Oct 30, 2012 · 8e1cf13 · 8e1cf13
1 parent 5853e8c
commit 8e1cf13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09aaf994e37c3e37fd2b0e9b1856038e31ae3b68
+refs/heads/master: 5a6a86121f55681b5ae7891d19a462883635beef
diff --git a/trunk/arch/arm/mach-davinci/devices-tnetv107x.c b/trunk/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -374,7 +374,7 @@ void __init tnetv107x_devices_init(struct tnetv107x_device_info *info)
 	 * complete sample conversion in time.
 	 */
 	tsc_clk = clk_get(NULL, "sys_tsc_clk");
-	if (tsc_clk) {
+	if (!IS_ERR(tsc_clk)) {
 		error = clk_set_rate(tsc_clk, 5000000);
 		WARN_ON(error < 0);
 		clk_put(tsc_clk);