From e7549b926dd3ceec048f5689df90d4ec970c9419 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Fri, 23 Oct 2015 13:30:20 +0200 Subject: more driver stuff from 3.2.72 --- drivers/video/riva/fbdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/video/riva/fbdev.c') diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index fabc90d..d8ab7be 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -1816,8 +1816,6 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var, specs->modedb, specs->modedb_len, NULL, 8); } else if (specs->modedb != NULL) { - /* get first mode in database as fallback */ - modedb = specs->modedb[0]; /* get preferred timing */ if (info->monspecs.misc & FB_MISC_1ST_DETAIL) { int i; @@ -1828,6 +1826,9 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var, break; } } + } else { + /* otherwise, get first mode in database */ + modedb = specs->modedb[0]; } var->bits_per_pixel = 8; riva_update_var(var, &modedb); -- cgit v1.1