From 255167bed4992f028cbd8ec78312ddcd7fa3b417 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 6 Feb 2008 01:39:38 -0800
Subject: [PATCH] --- yaml --- r: 83583 b: refs/heads/master c:
 40488db20e3f43e65f10747f9026fba7d59d29a3 h: refs/heads/master i:   83581:
 417782bd60dcb719e41dc96b1bbe680fe360d0b0   83579:
 b4bd51abf471475e35ed3841f1da188f3f8d6aff   83575:
 224ae45f60ccc28c5bc6b04a54d5d7538a5e46c1   83567:
 7ec3302a0a47f26dbc3b13ac92fe9e31ba8fac67   83551:
 7f955f3f2e396dfd34fbfbbae244b562b7df5851   83519:
 ecb780621fedd127e36ebe592f8e8a7b080821f1   83455:
 f3ddd4272cb8a8f272480b586747afcd74a93611 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/video/sm501fb.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4182bc8487a5..07f3405344e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc9c6a175fa8123587668c38959a105e3ccb6bbd
+refs/heads/master: 40488db20e3f43e65f10747f9026fba7d59d29a3
diff --git a/trunk/drivers/video/sm501fb.c b/trunk/drivers/video/sm501fb.c
index 8c39e4d5b08f..e83dfba7e636 100644
--- a/trunk/drivers/video/sm501fb.c
+++ b/trunk/drivers/video/sm501fb.c
@@ -1698,6 +1698,15 @@ static int sm501fb_suspend_fb(struct sm501fb_info *info,
 	if (par->screen.size == 0)
 		return 0;
 
+	/* blank the relevant interface to ensure unit power minimised */
+	(par->ops.fb_blank)(FB_BLANK_POWERDOWN, fbi);
+
+	/* tell console/fb driver we are suspending */
+
+	acquire_console_sem();
+	fb_set_suspend(fbi, 1);
+	release_console_sem();
+
 	/* backup copies in case chip is powered down over suspend */
 
 	par->store_fb = vmalloc(par->screen.size);
@@ -1717,12 +1726,6 @@ static int sm501fb_suspend_fb(struct sm501fb_info *info,
 
 	memcpy_fromio(par->store_fb, par->screen.k_addr, par->screen.size);
 	memcpy_fromio(par->store_cursor, par->cursor.k_addr, par->cursor.size);
-	/* blank the relevant interface to ensure unit power minimised */
-	(par->ops.fb_blank)(FB_BLANK_POWERDOWN, fbi);
-
-	acquire_console_sem();
-	fb_set_suspend(fbi, 1);
-	release_console_sem();
 
 	return 0;