Merge branch 'linux-2.6'

2 files changed, 7 insertions, 3 deletions

diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index f589999361e0..64ec7d629363 100644
--- 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", },
         {},
 };
 
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index ae0dbf4c1d66..0f2dfb0aaa6a 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -906,7 +906,7 @@ static int __init init_ipic_sysfs(void)
 {
         int rc;
 
-        if (!primary_ipic->regs)
+        if (!primary_ipic || !primary_ipic->regs)
                 return -ENODEV;
         printk(KERN_DEBUG "Registering ipic with sysfs...\n");