OMAP: DSP: N800: remaining updates for dsp parts

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / dsp / dsp_common.c

diff --git a/arch/arm/plat-omap/dsp/dsp_common.c b/arch/arm/plat-omap/dsp/dsp_common.c
index 2751324d0f883a4ecb8a9bcab82eb4f154b8e1ea..310ae3cb9129dac01bc29fa59d9db4cd1752c55b 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_common.c
+++ b/arch/arm/plat-omap/dsp/dsp_common.c
@@ -56,7 +56,7 @@ dsp_long_t dspmem_base, dspmem_size,
           daram_base, daram_size,
           saram_base, saram_size;
 
-struct cpustat {
+static struct cpustat {
        struct mutex lock;
        enum cpustat_e stat;
        enum cpustat_e req;
@@ -317,6 +317,8 @@ static int __init omap_dsp_init(void)
        api_ck_handle = clk_get(NULL, "api_ck");
        if (IS_ERR(api_ck_handle)) {
                printk(KERN_ERR "omapdsp: could not acquire api_ck handle.\n");
+               if (dsp_ck_handle != NULL)
+                       clk_put(dsp_ck_handle);
                return PTR_ERR(api_ck_handle);
        }
 
@@ -337,12 +339,14 @@ static int __init omap_dsp_init(void)
        dsp_ick_handle = clk_get(NULL, "dsp_ick");
        if (IS_ERR(dsp_ick_handle)) {
                printk(KERN_ERR "omapdsp: could not acquire dsp_ick handle.\n");
+               if (dsp_fck_handle != NULL)
+                       clk_put(dsp_fck_handle);
                return PTR_ERR(dsp_ick_handle);
        }
 #endif
 
        init_done = 1;
-       printk(KERN_INFO "omap_dsp_init() done\n");
+       pr_info("omap_dsp_init() done\n");
        return 0;
 }