From 97438c0a344138ed67cc75a6a2bace4ebb42a2f0 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@simtec.co.uk>
Date: Tue, 10 Feb 2009 13:40:38 +0100
Subject: [PATCH] --- yaml --- r: 137151 b: refs/heads/master c:
 60f793de891ea06fa870546336a88df543ec56ae h: refs/heads/master i:   137149:
 2b90e6f971c1258fffa3fbcad41d69ceaa8ee0e8   137147:
 0be9d8dcbe0d3167b35ae94ce23fd238e5f2c5cf   137143:
 337279dc5695c3ee8f1f6fe916b5ad2913b40bc4   137135:
 814e5a09cc40abd866016d21a7665c30ab0de30c   137119:
 f0aa0c37a0e12a1f02bff8ef24a7ef5a684f0b15   137087:
 1a0c694a48dbacd10ca5de270e2668dbf85cb43c v: v3

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

diff --git a/[refs] b/[refs]
index 0b8480faa0df..d2f8414c0930 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1144d6535fdea5133875dab4a0be5515ae5cb681
+refs/heads/master: 60f793de891ea06fa870546336a88df543ec56ae
diff --git a/trunk/drivers/video/s3c2410fb.c b/trunk/drivers/video/s3c2410fb.c
index 79cf0b1976aa..b0b4513ba537 100644
--- a/trunk/drivers/video/s3c2410fb.c
+++ b/trunk/drivers/video/s3c2410fb.c
@@ -1017,6 +1017,10 @@ static int s3c2410fb_resume(struct platform_device *dev)
 
 	s3c2410fb_init_registers(fbinfo);
 
+	/* re-activate our display after resume */
+	s3c2410fb_activate_var(fbinfo);
+	s3c2410fb_blank(FB_BLANK_UNBLANK, fbinfo);
+
 	return 0;
 }