From b7277d649d1134f81d986263758ed491f941f09f Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 14 Nov 2007 16:59:02 -0800
Subject: [PATCH] --- yaml --- r: 73679 b: refs/heads/master c:
 a9e60e5c3c4721dd216047e4c58c4eb89789f519 h: refs/heads/master i:   73677:
 ac92a26bd4294e5c4175ad904719177d8da9454f   73675:
 f6e594bb9df16ae784b319a321458da7d5ad6549   73671:
 07ec99758dd149d4194d6d71faa408d9ad81881b   73663:
 7a4170ad2ad075b3b143ce7c8f4b0ec239683755 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/video/sis/sis_main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e0212abcf4a1..6de7eb17e9c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43054412db5e5b3eda1eff6c2245ff4257560340
+refs/heads/master: a9e60e5c3c4721dd216047e4c58c4eb89789f519
diff --git a/trunk/drivers/video/sis/sis_main.c b/trunk/drivers/video/sis/sis_main.c
index bc7d23683735..37bd24b8d83b 100644
--- a/trunk/drivers/video/sis/sis_main.c
+++ b/trunk/drivers/video/sis/sis_main.c
@@ -1248,7 +1248,6 @@ sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive, struct fb_info *in
 	if(found_mode) {
 		ivideo->sisfb_mode_idx = sisfb_validate_mode(ivideo,
 				ivideo->sisfb_mode_idx, ivideo->currentvbflags);
-		ivideo->mode_no = sisbios_mode[ivideo->sisfb_mode_idx].mode_no[ivideo->mni];
 	} else {
 		ivideo->sisfb_mode_idx = -1;
 	}
@@ -1260,6 +1259,8 @@ sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive, struct fb_info *in
 		return -EINVAL;
 	}
 
+	ivideo->mode_no = sisbios_mode[ivideo->sisfb_mode_idx].mode_no[ivideo->mni];
+
 	if(sisfb_search_refresh_rate(ivideo, ivideo->refresh_rate, ivideo->sisfb_mode_idx) == 0) {
 		ivideo->rate_idx = sisbios_mode[ivideo->sisfb_mode_idx].rate_idx;
 		ivideo->refresh_rate = 60;