From 76a701a6c18251e1747c176d390b034b81b1488c Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 29 Aug 2011 23:14:25 +0300
Subject: [PATCH] --- yaml --- r: 268091 b: refs/heads/master c:
 dfbdf805798bb56acca75bdf7b1cad7818772dba h: refs/heads/master i:   268089:
 677e1f7f4f48c4c31384bf3f3036f08cdae6eeb7   268087:
 f28c4458b551784be5d77ef0661849acb1629b8e v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/xgifb/XGI_main_26.c | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8bb4808e37c6..1093da8e353c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 009adf2d4be9479004e41fd9b49a6136498f256b
+refs/heads/master: dfbdf805798bb56acca75bdf7b1cad7818772dba
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index e8bad0296daa..a9dc9489e342 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -48,6 +48,9 @@
 
 #define XGIFB_ROM_SIZE	65536
 
+static char *mode;
+static int vesa;
+
 /* -------------------- Macro definitions ---------------------------- */
 
 #undef XGIFBDEBUG
@@ -1959,9 +1962,9 @@ static int __init XGIfb_setup(char *options)
 			continue;
 
 		if (!strncmp(this_opt, "mode:", 5)) {
-			XGIfb_search_mode(this_opt + 5);
+			mode = this_opt + 5;
 		} else if (!strncmp(this_opt, "vesa:", 5)) {
-			XGIfb_search_vesamode(xgifb_optval(this_opt, 5));
+			vesa = xgifb_optval(this_opt, 5);
 		} else if (!strncmp(this_opt, "vrate:", 6)) {
 			xgi_video_info.refresh_rate = xgifb_optval(this_opt, 6);
 		} else if (!strncmp(this_opt, "rate:", 5)) {
@@ -1987,7 +1990,7 @@ static int __init XGIfb_setup(char *options)
 		} else if (!strncmp(this_opt, "userom:", 7)) {
 			XGIfb_userom = xgifb_optval(this_opt, 7);
 		} else {
-			XGIfb_search_mode(this_opt);
+			mode = this_opt;
 		}
 	}
 	return 0;
@@ -2308,6 +2311,11 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 
 	}
 
+	if (mode)
+		XGIfb_search_mode(mode);
+	else if (vesa != -1)
+		XGIfb_search_vesamode(vesa);
+
 	if (xgifb_mode_idx >= 0)
 		xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx);
 
@@ -2513,9 +2521,6 @@ module_init(xgifb_init);
 
 #ifdef MODULE
 
-static char *mode;
-static int vesa;
-
 MODULE_DESCRIPTION("Z7 Z9 Z9S Z11 framebuffer device driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("XGITECH , Others");
@@ -2541,10 +2546,6 @@ MODULE_PARM_DESC(filter,
 static int __init xgifb_init_module(void)
 {
 	printk("\nXGIfb_init_module");
-	if (mode)
-		XGIfb_search_mode(mode);
-	else if (vesa != -1)
-		XGIfb_search_vesamode(vesa);
 
 	return xgifb_init();
 }