diff --git a/[refs] b/[refs]
index 21731fa38d9b..b7cfcee20cb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e8b71d559632dd70c9799ea8b5c133a2ddcea9
+refs/heads/master: c40eea98cd723ac8942ed2db39c30182c0c928c7
diff --git a/trunk/drivers/video/modedb.c b/trunk/drivers/video/modedb.c
index 42f5d76a8777..8d81ef019c6c 100644
--- a/trunk/drivers/video/modedb.c
+++ b/trunk/drivers/video/modedb.c
@@ -510,7 +510,9 @@ int fb_find_mode(struct fb_var_screeninfo *var,
 	default_bpp = 8;
 
     /* Did the user specify a video mode? */
-    if (mode_option || (mode_option = fb_mode_option)) {
+    if (!mode_option)
+	mode_option = fb_mode_option;
+    if (mode_option) {
 	const char *name = mode_option;
 	unsigned int namelen = strlen(name);
 	int res_specified = 0, bpp_specified = 0, refresh_specified = 0;