diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-21 15:42:54 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 03:26:22 -0400 |
commit | e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289 (patch) | |
tree | a5049240909c3397c7fdae606c131db543ff684d | |
parent | b9b52cf4617bedccef64cee63ba8ec68b213bc21 (diff) |
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 <geert@linux-m68k.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | drivers/video/amifb.c | 4 |
1 files changed, 2 insertions, 2 deletions
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: | |||
2295 | defmode = amiga_vblank == 50 ? DEFMODE_PAL | 2295 | defmode = amiga_vblank == 50 ? DEFMODE_PAL |
2296 | : DEFMODE_NTSC; | 2296 | : DEFMODE_NTSC; |
2297 | if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > | 2297 | if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > |
2298 | VIDEOMEMSIZE_ECS_1M) | 2298 | VIDEOMEMSIZE_ECS_2M) |
2299 | fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M; | 2299 | fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M; |
2300 | else | 2300 | else |
2301 | fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M; | 2301 | fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M; |
@@ -2312,7 +2312,7 @@ default_chipset: | |||
2312 | maxfmode = TAG_FMODE_4; | 2312 | maxfmode = TAG_FMODE_4; |
2313 | defmode = DEFMODE_AGA; | 2313 | defmode = DEFMODE_AGA; |
2314 | if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > | 2314 | if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > |
2315 | VIDEOMEMSIZE_AGA_1M) | 2315 | VIDEOMEMSIZE_AGA_2M) |
2316 | fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M; | 2316 | fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M; |
2317 | else | 2317 | else |
2318 | fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M; | 2318 | fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M; |