From 81c01966db954267d821c0be468f4a0a42b0212b Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Mon, 8 Dec 2008 18:51:01 +0800
Subject: [PATCH] --- yaml --- r: 123945 b: refs/heads/master c:
 07f651c72ac0530033883c113939d9b9c7fa75e5 h: refs/heads/master i:   123943:
 e155c5da811b382c5e22992ea782280ec1bbdafd v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/pxafb.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a115ed1bdad..c886204cd767 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69bdea7047fbac88beb8b7ba9e428c4f0e53f563
+refs/heads/master: 07f651c72ac0530033883c113939d9b9c7fa75e5
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index 1e1c4ec0d3b9..ab689597f259 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -794,11 +794,15 @@ static int pxafb_smart_thread(void *arg)
 		if (try_to_freeze())
 			continue;
 
+		mutex_lock(&fbi->ctrlr_lock);
+
 		if (fbi->state == C_ENABLE) {
 			inf->smart_update(&fbi->fb);
 			complete(&fbi->refresh_done);
 		}
 
+		mutex_unlock(&fbi->ctrlr_lock);
+
 		set_current_state(TASK_INTERRUPTIBLE);
 		schedule_timeout(30 * HZ / 1000);
 	}