# HG changeset patch
# User lgb
# Date 984351674 0
# Node ID 315979891f2d802b819d318f67448f5bb8c0bd60
# Parent  b97d1e5fddea1b91d07afd2bef7ece533c48b244
Force matrox memsize module option fixes

diff -r b97d1e5fddea -r 315979891f2d drivers/mga_vid.c
--- a/drivers/mga_vid.c	Sun Mar 11 22:24:03 2001 +0000
+++ b/drivers/mga_vid.c	Sun Mar 11 23:01:14 2001 +0000
@@ -2,7 +2,7 @@
 // double buffering added by A'rpi/ESP-team
 
 // Set this value, if autodetection fails! (video ram size in megabytes)
-//#define MGA_MEMORY_SIZE 32
+// #define MGA_MEMORY_SIZE 16
 
 //#define MGA_ALLOW_IRQ
 
@@ -741,8 +741,8 @@
 	if (mga_force_memsize) {
 		printk(KERN_INFO "mga_vid: memsize forced to %d MB\n", mga_force_memsize);
 		/* we need the size in bytes */
-		mga_ram_size = ((unsigned long) mga_force_memsize) << 20;
-	}
+		mga_ram_size = ((unsigned long) mga_force_memsize);
+	} else {
 
 	if (is_g400){
 		switch((card_option>>10)&0x17){
@@ -777,7 +777,7 @@
 		    case 0:  mga_ram_size = 8; break;
 		    default: mga_ram_size = 16;
 		}
-	}
+	} }
 #if 0
 //	printk("List resources -----------\n");
 	for(temp=0;temp<DEVICE_COUNT_RESOURCE;temp++){
@@ -915,7 +915,7 @@
 	printk(KERN_INFO "Matrox MGA G200/G400/G450 YUV Video interface v2.01 (c) Aaron Holtzman & A'rpi\n");
 
 	if (mga_force_memsize) {
-		if (mga_force_memsize != 16 || mga_force_memsize != 32 ||
+		if (mga_force_memsize != 16 && mga_force_memsize != 32 &&
 				mga_force_memsize != 64) {
 			printk(KERN_ERR "mga_vid: invalid memsize: %dMB\n", mga_force_memsize);
 			return -EINVAL;