diff --git a/[refs] b/[refs]
index e2ce9e7b2a7d..e290c248f746 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcf8eee94f7eb2671e6d5774e81d45ad06b4f980
+refs/heads/master: 27be9a9e378dad166fc81df310e052e7b67cb667
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index a3bdcc152671..a2e5b5100ab4 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -1648,7 +1648,8 @@ pxafb_freq_transition(struct notifier_block *nb, unsigned long val, void *data)
 
 	switch (val) {
 	case CPUFREQ_PRECHANGE:
-		set_ctrlr_state(fbi, C_DISABLE_CLKCHANGE);
+		if (!fbi->overlay[0].usage && !fbi->overlay[1].usage)
+			set_ctrlr_state(fbi, C_DISABLE_CLKCHANGE);
 		break;
 
 	case CPUFREQ_POSTCHANGE: