Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / drivers / video / fbmem.c

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 010d191..cde4619 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1930,6 +1930,9 @@ int fb_get_options(const char *name, char **option)
                                options = opt + name_len + 1;
                }
        }
+       /* No match, pass global option */
+       if (!options && option && fb_mode_option)
+               options = kstrdup(fb_mode_option, GFP_KERNEL);
        if (options && !strncmp(options, "off", 3))
                retval = 1;