git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
staging
/
msm
/
mdp4_overlay.c
diff --git
a/drivers/staging/msm/mdp4_overlay.c
b/drivers/staging/msm/mdp4_overlay.c
index
de284c2
..
b9acf52
100644
(file)
--- a/
drivers/staging/msm/mdp4_overlay.c
+++ b/
drivers/staging/msm/mdp4_overlay.c
@@
-696,7
+696,7
@@
void mdp4_mixer_stage_down(struct mdp4_overlay_pipe *pipe)
stage = pipe->mixer_stage;
mixer = pipe->mixer_num;
- if (pipe != ctrl->stage[mixer][stage]) /* not runing */
+ if (pipe != ctrl->stage[mixer][stage]) /* not run
n
ing */
return;
/* MDP_LAYERMIXER_IN_CFG, shard by both mixer 0 and 1 */