From patchwork Wed Mar 2 21:17:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Vanderlip X-Patchwork-Id: 604101 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p22LJCC8028643 for ; Wed, 2 Mar 2011 21:19:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757830Ab1CBVSF (ORCPT ); Wed, 2 Mar 2011 16:18:05 -0500 Received: from wolverine02.qualcomm.com ([199.106.114.251]:19964 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757557Ab1CBVSE (ORCPT ); Wed, 2 Mar 2011 16:18:04 -0500 X-IronPort-AV: E=McAfee;i="5400,1158,6273"; a="77438299" Received: from ironmsg03-r.qualcomm.com ([172.30.46.17]) by wolverine02.qualcomm.com with ESMTP; 02 Mar 2011 13:18:04 -0800 X-IronPort-AV: E=Sophos;i="4.62,253,1297065600"; d="scan'208";a="56219428" Received: from carlv-linux.qualcomm.com ([10.52.52.151]) by Ironmsg03-R.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Mar 2011 13:18:04 -0800 Received: from carlv-linux.qualcomm.com (localhost [127.0.0.1]) by carlv-linux.qualcomm.com (8.14.2/8.14.2/1.0) with ESMTP id p22LI3Sv011701; Wed, 2 Mar 2011 13:18:03 -0800 Received: (from carlv@localhost) by carlv-linux.qualcomm.com (8.14.2/8.12.1/Submit) id p22LI3dX011700; Wed, 2 Mar 2011 13:18:03 -0800 From: Carl Vanderlip To: David Brown , Daniel Walker , Bryan Huntsman Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Carl Vanderlip , linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER) Subject: [PATCH 3/4] [ARM] msm_fb: Fix framebuffer console Date: Wed, 2 Mar 2011 13:17:51 -0800 Message-Id: <1299100671-11665-1-git-send-email-carlv@codeaurora.org> X-Mailer: git-send-email 1.7.3.3 In-Reply-To: <1299100542-11120-1-git-send-email-carlv@codeaurora.org> References: <1299100542-11120-1-git-send-email-carlv@codeaurora.org> To: David Brown , Daniel Walker , Bryan Huntsman MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 02 Mar 2011 21:19:12 +0000 (UTC) diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c index fe5efe5..ec35130 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,