From: Arve Hjønnevåg Date: Wed, 2 Mar 2011 21:17:51 +0000 (-0800) Subject: msm_fb: Fix framebuffer console X-Git-Tag: v2.6.39-rc1~433^2~11 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5d55779a5d95acdaa1080f1a4806fd6d4984d1e4;p=~shefty%2Frdma-dev.git 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 Signed-off-by: Arve Hjønnevåg Signed-off-by: David Brown --- diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c index fe5efe59d5c..ec351309e60 100644 --- 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,