msm_fb: Fix framebuffer console

Don't allow non panning updates to bypass the wait for the panel to turn on.

Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: David Brown <davidb@codeaurora.org>

diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index fe5efe59d5c5cd428590ced46e993ac5ec5e3486..ec351309e60739c1969102614b6d55a46d95d837 100644 (file)
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -219,8 +219,8 @@ restart:
 
        sleeping = msmfb->sleeping;
        /* on a full update, if the last frame has not completed, wait for it */
-       if (pan_display && (msmfb->frame_requested != msmfb->frame_done ||
-                           sleeping == UPDATING)) {
+       if ((pan_display && msmfb->frame_requested != msmfb->frame_done) ||
+                           sleeping == UPDATING) {
                int ret;
                spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
                ret = wait_event_interruptible_timeout(msmfb->frame_wq,