---

yaml --- r: 228221 b: refs/heads/master c: 280740a h: refs/heads/master i: 228219: 90b3deb v: v3
git-mirror · Nov 29, 2010 · e572199 · e572199
1 parent b02023d
commit e572199
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8956110dbbb75773d851854e6e11cd8428fce71a
+refs/heads/master: 280740a9016db986758db811bbc998acc79e5551
diff --git a/trunk/drivers/staging/msm/tvenc.c b/trunk/drivers/staging/msm/tvenc.c
@@ -279,12 +279,13 @@ static int __init tvenc_driver_init(void)
 
 	if (IS_ERR(tvenc_clk)) {
 		printk(KERN_ERR "error: can't get tvenc_clk!\n");
-		return IS_ERR(tvenc_clk);
+		return PTR_ERR(tvenc_clk);
 	}
 
 	if (IS_ERR(tvdac_clk)) {
 		printk(KERN_ERR "error: can't get tvdac_clk!\n");
-		return IS_ERR(tvdac_clk);
+		clk_put(tvenc_clk);
+		return PTR_ERR(tvdac_clk);
 	}
 
 //	pm_qos_add_requirement(PM_QOS_SYSTEM_BUS_FREQ , "tvenc",