---

yaml --- r: 294195 b: refs/heads/master c: c718a54 h: refs/heads/master i: 294193: 82d9ad6 294191: 5fbab75 v: v3
git-mirror · Feb 13, 2012 · 401fcf4 · 401fcf4
1 parent 19f3cf7
commit 401fcf4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d242aa64d27ebd258a12aa0a5da068e25e01f5
+refs/heads/master: c718a54649475cc397484f96e70f6d0fdd267165
diff --git a/trunk/drivers/video/riva/fbdev.c b/trunk/drivers/video/riva/fbdev.c
@@ -1816,6 +1816,8 @@ 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;
@@ -1826,9 +1828,6 @@ 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);