patch-2.4.0-test6 linux/drivers/video/cyberfb.c

• Lines: 19
• Date: Sun Aug 6 11:25:46 2000
• Orig file: v2.4.0-test5/linux/drivers/video/cyberfb.c
• Orig date: Thu Jul 27 17:38:01 2000

diff -u --recursive --new-file v2.4.0-test5/linux/drivers/video/cyberfb.c linux/drivers/video/cyberfb.c
@@ -1066,7 +1066,7 @@
 	    CyberRegs_phys = CyberMem_phys + 0x00c00000;
 	    if (!request_mem_region(CyberRegs_phys, 0x10000, "S3 Trio64"))
 		continue;
-	    if (!request_mem_region(CyberMem_phys, 0x4000000, "RAM")) {
+	    if (!request_mem_region(CyberMem_phys, 0x400000, "RAM")) {
 		release_mem_region(CyberRegs_phys, 0x10000);
 		continue;
 	    }
@@ -1110,7 +1110,8 @@
 
 	    if (register_framebuffer(&fb_info) < 0) {
 		    DPRINTK("EXIT - register_framebuffer failed\n");
-		    release_mem_region(board_addr, board_size);
+		    release_mem_region(CyberMem_phys, 0x400000);
+		    release_mem_region(CyberRegs_phys, 0x10000);
 		    return -EINVAL;
 	    }