aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/msm/mddi.c5
1 files changed, 2 insertions, 3 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,
318static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask) 318static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask)
319{ 319{
320 if (mddi_wait_interrupt_timeout(mddi, intmask, HZ/10) == 0) 320 if (mddi_wait_interrupt_timeout(mddi, intmask, HZ/10) == 0)
321 printk(KERN_INFO KERN_ERR "mddi_wait_interrupt %d, timeout " 321 printk(KERN_INFO "mddi_wait_interrupt %d, timeout "
322 "waiting for %x, INT = %x, STAT = %x gotint = %x\n", 322 "waiting for %x, INT = %x, STAT = %x gotint = %x\n",
323 current->pid, intmask, mddi_readl(INT), mddi_readl(STAT), 323 current->pid, intmask, mddi_readl(INT), mddi_readl(STAT),
324 mddi->got_int); 324 mddi->got_int);
@@ -465,8 +465,7 @@ static int __init mddi_get_client_caps(struct mddi_info *mddi)
465 465
466 if (mddi->flags & FLAG_HAVE_CAPS) 466 if (mddi->flags & FLAG_HAVE_CAPS)
467 break; 467 break;
468 printk(KERN_INFO KERN_ERR "mddi_init, timeout waiting for " 468 printk(KERN_INFO "mddi_init, timeout waiting for caps\n");
469 "caps\n");
470 } 469 }
471 return mddi->flags & FLAG_HAVE_CAPS; 470 return mddi->flags & FLAG_HAVE_CAPS;
472} 471}