Commit e3e4e9c6 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Paul Mundt
Browse files

fbdev/amifb: Correct check for video memory size 



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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b9b52cf4

drivers/video/amifb.c

+2 −2
Original line number Diff line number Diff line
@@ -2295,7 +2295,7 @@ static int __init amifb_probe(struct platform_device *pdev) 
			    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 @@ static int __init amifb_probe(struct platform_device *pdev) 
			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;