---

yaml --- r: 137151 b: refs/heads/master c: 60f793d h: refs/heads/master i: 137149: 2b90e6f 137147: 0be9d8d 137143: 337279d 137135: 814e5a0 137119: f0aa0c3 137087: 1a0c694 v: v3
git-mirror · Feb 19, 2009 · 97438c0 · 97438c0
1 parent 9bdc3de
commit 97438c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;
 }