Ignore the per-driver video options if no driver name has been specified to fb_get_option(). Return the global options in this case. Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx> --- drivers/video/fbdev/core/fb_cmdline.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/core/fb_cmdline.c b/drivers/video/fbdev/core/fb_cmdline.c index 702b00b71870..cc8a88e8f308 100644 --- a/drivers/video/fbdev/core/fb_cmdline.c +++ b/drivers/video/fbdev/core/fb_cmdline.c @@ -39,13 +39,18 @@ int fb_get_options(const char *name, char **option) { const char *options = NULL; int retval = 0; - int name_len = strlen(name), i; + size_t name_len; char *opt; + if (name) + name_len = strlen(name); + if (name_len && ofonly && strncmp(name, "offb", 4)) retval = 1; if (name_len && !retval) { + unsigned int i; + for (i = 0; i < FB_MAX; i++) { if (video_options[i] == NULL) continue; -- 2.39.1