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);
 	}