summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Januszewski <spock@gentoo.org>2008-04-28 02:15:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 08:58:38 -0700
commit5e72b32d86841e4a4a3045d8e35a39eb53ce7ce2 (patch)
treedd234ca4c616ac7c3a746fbe8e6a576656ed793a
parente0745ae7210c14e611a1fab2af820a4c2e447de5 (diff)
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 <spock@gentoo.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/uvesafb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 93361656316c..c4f4d7616317 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 *)