ARM: OMAP: Fix omap1 McBSP without CONFIG_OMAP_DSP

[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 873509b71030eaa31ea6c32a157cd4f616e96dbf..087971ad8c02e4da9f46ae29374324f91f0e3dcf 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_common.c
+++ b/arch/arm/plat-omap/dsp/dsp_common.c
@@ -43,6 +43,8 @@
 #define dsp_boot_config(mode)  writel((mode), DSP_IPI_DSPBOOTCONFIG)
 #endif
 
+struct omap_dsp *omap_dsp;
+
 #if defined(CONFIG_ARCH_OMAP1)
 struct clk *dsp_ck_handle;
 struct clk *api_ck_handle;
@@ -371,7 +373,8 @@ static void dsp_cpustat_update(void)
                        __dsp_core_enable();
 #endif
                        cpustat.stat = CPUSTAT_RUN;
-                       enable_irq(omap_dsp->mmu_irq);
+                       if (omap_dsp != NULL)
+                               enable_irq(omap_dsp->mmu_irq);
                }
                return;
        }
@@ -379,7 +382,8 @@ static void dsp_cpustat_update(void)
        /* cpustat.req < CPUSTAT_RUN */
 
        if (cpustat.stat == CPUSTAT_RUN) {
-               disable_irq(omap_dsp->mmu_irq);
+               if (omap_dsp != NULL)
+                       disable_irq(omap_dsp->mmu_irq);
 #ifdef CONFIG_ARCH_OMAP1
                clk_disable(api_ck_handle);
 #endif