[POWERPC] Fix Oops with TQM5200 on TQM5200

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / bestcomm / bestcomm.c

diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index f589999361e060958c145ac199eec85ae466f24a..64ec7d6293633822f8c8afd000068d73a4160442 100644 (file)
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c
@@ -52,6 +52,10 @@ bcom_task_alloc(int bd_count, int bd_size, int priv_size)
        int i, tasknum = -1;
        struct bcom_task *tsk;
 
+       /* Don't try to do anything if bestcomm init failed */
+       if (!bcom_eng)
+               return NULL;
+
        /* Get and reserve a task num */
        spin_lock(&bcom_eng->lock);
 
@@ -484,8 +488,8 @@ mpc52xx_bcom_remove(struct of_device *op)
 }
 
 static struct of_device_id mpc52xx_bcom_of_match[] = {
-       { .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", },
-       { .type = "dma-controller", .compatible = "mpc5200-bestcomm", },
+       { .compatible = "fsl,mpc5200-bestcomm", },
+       { .compatible = "mpc5200-bestcomm", },
        {},
 };