summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2023-02-09 14:55:01 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2023-02-20 14:56:43 +0100
commitcedaf7cddd7339a3e189a59eec35e76c6557a6d5 (patch)
treeba76762a3f093e668d55bc0f9947632aa37bde2e
parent73ce73c30ba9ae4d90fdfad7ebe9104001d5d851 (diff)
fbdev: Support NULL for name in option-string lookup
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@suse.de> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230209135509.7786-4-tzimmermann@suse.de
-rw-r--r--drivers/video/fbdev/core/fb_cmdline.c7
1 files changed, 6 insertions, 1 deletions
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;