diff --git a/[refs] b/[refs]
index cccc834477f6..8e3c6c352201 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8126a044f9e686f4ecf95e32fd89ad1dd48b4183
+refs/heads/master: 17cc6281c12b26425209c58e3d8825a9568db3cc
diff --git a/trunk/drivers/video/modedb.c b/trunk/drivers/video/modedb.c
index 1aa36d302a51..7e539b69a9a2 100644
--- a/trunk/drivers/video/modedb.c
+++ b/trunk/drivers/video/modedb.c
@@ -791,8 +791,9 @@ struct fb_videomode *fb_find_best_mode(struct fb_var_screeninfo *var,
 			if (diff > d) {
 				diff = d;
 				best = mode;
-			} else if (diff == d && mode->refresh > best->refresh)
-			    best = mode;
+			} else if (diff == d && best &&
+				   mode->refresh > best->refresh)
+				best = mode;
 		}
 	}
 	return best;