Merge branch 'copy_user' of git://git.marvell.com/orion into devel

[linux-2.6-microblaze.git] / drivers / video / s3c2410fb.c

diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 79cf0b1..b0b4513 100644 (file)
--- a/drivers/video/s3c2410fb.c
+++ b/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;
 }