Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 221010
b: refs/heads/master
c: 17f52ed
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Daniel Walker committed Oct 27, 2010
1 parent 2f68636 commit 6198844
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d601c795c41c0016790ff1a92f2307fd4ff29791
refs/heads/master: 17f52ed7358dc54e5534f9ad495e90306c68cfcf
5 changes: 2 additions & 3 deletions trunk/drivers/video/msm/mddi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 6198844

Please sign in to comment.