diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-08-29 23:14:32 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 11:41:25 -0700 |
| commit | c32283089cf3c2dddfb251ff73c37cc24b92d55d (patch) | |
| tree | 4dff92beac45d0474979b1195bac85827d5ebb42 /drivers/staging/xgifb/XGI_main_26.c | |
| parent | 44d0244021b951a5473ae96107847f83a9511ed8 (diff) | |
| download | op-kernel-dev-c32283089cf3c2dddfb251ff73c37cc24b92d55d.zip op-kernel-dev-c32283089cf3c2dddfb251ff73c37cc24b92d55d.tar.gz | |
staging: xgifb: delete all references to mode "none"
Delete all references to mode "none". It should be handled like any
other invalid mode.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index ff0392b..d903e8e 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -49,7 +49,7 @@ #define XGIFB_ROM_SIZE 65536 static char *mode; -static int vesa; +static int vesa = -1; /* -------------------- Macro definitions ---------------------------- */ @@ -458,11 +458,6 @@ static void XGIfb_search_mode(const char *name) { int i = 0, j = 0, l; - if (!strcmp(name, XGIbios_mode[MODE_INDEX_NONE].name)) { - printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n"); - return; - } - while (XGIbios_mode[i].mode_no != 0) { l = min(strlen(name), strlen(XGIbios_mode[i].name)); if (!strncmp(name, XGIbios_mode[i].name, l)) { @@ -480,11 +475,8 @@ static void XGIfb_search_vesamode(unsigned int vesamode) { int i = 0, j = 0; - if (vesamode == 0) { - - printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n"); - return; - } + if (vesamode == 0) + goto invalid; vesamode &= 0x1dff; /* Clean VESA mode number from other flags */ @@ -497,6 +489,8 @@ static void XGIfb_search_vesamode(unsigned int vesamode) } i++; } + +invalid: if (!j) printk(KERN_INFO "XGIfb: Invalid VESA mode 0x%x'\n", vesamode); } |
