From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Thu, 18 Oct 2007 10:04:36 +0000 (-0700)
Subject: fb modedb: Refactor confusing mode_option assignment
X-Git-Tag: v2.6.24-rc1~443
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c40eea98cd723ac8942ed2db39c30182c0c928c7;p=linux-2.6

fb modedb: Refactor confusing mode_option assignment

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
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>
---

diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 42f5d76a87..8d81ef019c 100644
--- a/drivers/video/modedb.c
+++ b/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;