2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index 7c316c34dfca..b66d86ac7cea 100644
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -318,7 +318,7 @@ static long mddi_wait_interrupt_timeout(struct mddi_info *mddi,
 static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask)
 {
         if (mddi_wait_interrupt_timeout(mddi, intmask, HZ/10) == 0)
-                printk(KERN_INFO KERN_ERR "mddi_wait_interrupt %d, timeout "
+                printk(KERN_INFO "mddi_wait_interrupt %d, timeout "
                        "waiting for %x, INT = %x, STAT = %x gotint = %x\n",
                        current->pid, intmask, mddi_readl(INT), mddi_readl(STAT),
                        mddi->got_int);
@@ -465,8 +465,7 @@ static int __init mddi_get_client_caps(struct mddi_info *mddi)
 
                 if (mddi->flags & FLAG_HAVE_CAPS)
                         break;
-                printk(KERN_INFO KERN_ERR "mddi_init, timeout waiting for "
-                                "caps\n");
+                printk(KERN_INFO "mddi_init, timeout waiting for caps\n");
         }
         return mddi->flags & FLAG_HAVE_CAPS;
 }
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 3c28db03ad39..c3636d55a3c5 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -90,7 +90,7 @@ static int locked_disable_mdp_irq(struct mdp_info *mdp, uint32_t mask)
         mdp_irq_mask &= ~(mask);
         /* if no one is waiting on the interrupt, disable it */
         if (!mdp_irq_mask) {
-                disable_irq(mdp->irq);
+                disable_irq_nosync(mdp->irq);
                 if (clk)
                         clk_disable(clk);
         }
@@ -482,6 +482,7 @@ int mdp_probe(struct platform_device *pdev)
         /* register mdp device */
         mdp->mdp_dev.dev.parent = &pdev->dev;
         mdp->mdp_dev.dev.class = mdp_class;
+        dev_set_name(&mdp->mdp_dev.dev, "mdp%d", pdev->id);
 
         /* if you can remove the platform device you'd have to implement
          * this: