]> git.karo-electronics.de Git - linux-beck.git/commitdiff
fbdev/amifb: Correct check for video memory size
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sat, 21 May 2011 19:42:54 +0000 (19:42 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 07:26:22 +0000 (16:26 +0900)
The check should compare the available memory size with the highest allocation
value (VIDEOMEMSIZE_*_2M), not with the lowest value (VIDEOMEMSIZE_*_1M).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/video/amifb.c

index e5d6b56d4447e274d0db3f8eedf68cda99bfb53e..603f84fae6a1b0a564d1c78e9679f7498ade5196 100644 (file)
@@ -2295,7 +2295,7 @@ default_chipset:
                            defmode = amiga_vblank == 50 ? DEFMODE_PAL
                                                         : DEFMODE_NTSC;
                        if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >
-                           VIDEOMEMSIZE_ECS_1M)
+                           VIDEOMEMSIZE_ECS_2M)
                                fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M;
                        else
                                fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M;
@@ -2312,7 +2312,7 @@ default_chipset:
                        maxfmode = TAG_FMODE_4;
                        defmode = DEFMODE_AGA;
                        if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >
-                           VIDEOMEMSIZE_AGA_1M)
+                           VIDEOMEMSIZE_AGA_2M)
                                fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M;
                        else
                                fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M;