Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / msm / tvenc.c

diff --git a/drivers/staging/msm/tvenc.c b/drivers/staging/msm/tvenc.c
index f41c5ac22f25d578b63a905acfc11ca96077be97..4fbb77b253d38054118c0ce1074962236771966c 100644 (file)
--- a/drivers/staging/msm/tvenc.c
+++ b/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",