From e572199aa438a9e821e102db7336b7d23cf7b09a Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Fri, 26 Nov 2010 20:06:53 +0300 Subject: [PATCH] --- yaml --- r: 228221 b: refs/heads/master c: 280740a9016db986758db811bbc998acc79e5551 h: refs/heads/master i: 228219: 90b3deb77f27c8c4b810dd2a0ee5251223616f16 v: v3 --- [refs] | 2 +- trunk/drivers/staging/msm/tvenc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cfa0c24386f8..db1ff56ac3f0 100644 --- 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 index f41c5ac22f25..4fbb77b253d3 100644 --- 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",