|
@@ -448,8 +448,10 @@ static int __init fb_console_setup(char *this_opt)
|
|
|
return 1;
|
|
|
|
|
|
while ((options = strsep(&this_opt, ",")) != NULL) {
|
|
|
- if (!strncmp(options, "font:", 5))
|
|
|
+ if (!strncmp(options, "font:", 5)) {
|
|
|
strlcpy(fontname, options + 5, sizeof(fontname));
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
if (!strncmp(options, "scrollback:", 11)) {
|
|
|
options += 11;
|
|
@@ -457,13 +459,9 @@ static int __init fb_console_setup(char *this_opt)
|
|
|
fbcon_softback_size = simple_strtoul(options, &options, 0);
|
|
|
if (*options == 'k' || *options == 'K') {
|
|
|
fbcon_softback_size *= 1024;
|
|
|
- options++;
|
|
|
}
|
|
|
- if (*options != ',')
|
|
|
- return 1;
|
|
|
- options++;
|
|
|
- } else
|
|
|
- return 1;
|
|
|
+ }
|
|
|
+ continue;
|
|
|
}
|
|
|
|
|
|
if (!strncmp(options, "map:", 4)) {
|
|
@@ -478,8 +476,7 @@ static int __init fb_console_setup(char *this_opt)
|
|
|
|
|
|
fbcon_map_override();
|
|
|
}
|
|
|
-
|
|
|
- return 1;
|
|
|
+ continue;
|
|
|
}
|
|
|
|
|
|
if (!strncmp(options, "vc:", 3)) {
|
|
@@ -491,7 +488,8 @@ static int __init fb_console_setup(char *this_opt)
|
|
|
if (*options++ == '-')
|
|
|
last_fb_vc = simple_strtoul(options, &options, 10) - 1;
|
|
|
fbcon_is_default = 0;
|
|
|
- }
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
if (!strncmp(options, "rotate:", 7)) {
|
|
|
options += 7;
|
|
@@ -499,6 +497,7 @@ static int __init fb_console_setup(char *this_opt)
|
|
|
initial_rotation = simple_strtoul(options, &options, 0);
|
|
|
if (initial_rotation > 3)
|
|
|
initial_rotation = 0;
|
|
|
+ continue;
|
|
|
}
|
|
|
}
|
|
|
return 1;
|