summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2007-10-18 03:04:36 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 14:37:17 -0700
commitc40eea98cd723ac8942ed2db39c30182c0c928c7 (patch)
treee20fd48d07faf220be72db779d7922cdeee057da
parent75e8b71d559632dd70c9799ea8b5c133a2ddcea9 (diff)
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>
-rw-r--r--drivers/video/modedb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 42f5d76a8777..8d81ef019c6c 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;