diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-19 05:43:05 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-19 05:43:05 +1200 |
| commit | 2a8cbf2a02784efc02f7093000010e20c4ebc9ea (patch) | |
| tree | 8009bcdbcc7a547089483acc80f2bbb8cb644402 /drivers/video/fbdev/core/fbcon.c | |
| parent | c3653ebdf89315a3a683f03b8b181942e452d603 (diff) | |
| parent | 890d14d2d4b57ff5a149309da3ed36c8a529987f (diff) | |
| download | linux-2a8cbf2a02784efc02f7093000010e20c4ebc9ea.tar.gz | |
Merge tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux
Pull fbdev fixes from Bartlomiej Zolnierkiewicz:
- fix stack memory leak in omap2fb driver (Vlad Tsyrklevich)
- fix OF node name handling v4.20 regression in offb driver (Rob
Herring)
- convert CONFIG_FB_LOGO_CENTER config option added in v5.0-rc1 into a
kernel parameter (Peter Rosin)
* tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux:
fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option
fbdev: offb: Fix OF node name handling
omap2fb: Fix stack memory disclosure
Diffstat (limited to 'drivers/video/fbdev/core/fbcon.c')
| -rw-r--r-- | drivers/video/fbdev/core/fbcon.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 8976190b6c1f..bfa1360ec750 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -510,6 +510,13 @@ static int __init fb_console_setup(char *this_opt) continue; } #endif + + if (!strncmp(options, "logo-pos:", 9)) { + options += 9; + if (!strcmp(options, "center")) + fb_center_logo = true; + continue; + } } return 1; } |