From: Geert Uytterhoeven Date: Sat, 21 May 2011 19:42:54 +0000 (+0000) Subject: fbdev/amifb: Correct check for video memory size X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289;p=linux-beck.git 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: Geert Uytterhoeven Signed-off-by: Paul Mundt --- diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index e5d6b56d4447..603f84fae6a1 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c @@ -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;