From 5e72b32d86841e4a4a3045d8e35a39eb53ce7ce2 Mon Sep 17 00:00:00 2001 From: Michal Januszewski Date: Mon, 28 Apr 2008 02:15:15 -0700 Subject: uvesafb: don't treat valid modes returned byfb_find_mode() as errors Don't treat valid modes returned by fb_find_mode() (best-fit modes, default modes or the first valid mode) as errors. Currently, when fb_find_mode() finds a valid mode belonging to one of the above-mentioned classes, uvesafb will ignore it and will try to set a 640x480 video mode. The expected behaviour (introduced by this patch) would be to use the valid mode returned by fb_find_mode() instead. Signed-off-by: Michal Januszewski Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/uvesafb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index 93361656316..c4f4d761631 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c @@ -885,7 +885,7 @@ static int __devinit uvesafb_vbe_init_mode(struct fb_info *info) } /* fb_find_mode() failed */ - if (i == 0 || i >= 3) { + if (i == 0) { info->var.xres = 640; info->var.yres = 480; mode = (struct fb_videomode *) -- cgit v1.2.3-18-g5258