Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vfb: only enable if explicitly requested when compiled in

Browse source 
The Kconfig help for the vfb driver says:
   Do NOT enable it for normal systems! To protect the innocent, it
   has to be enabled explicitly at boot time using the kernel option
   `video=vfb:'.

This change lets the code match the description.

Support for vfb:disable is kept for backwards compatibility; vfb:off works
because it is tested at a higher level.

Note: any undefined option (e.g. vfb:enable) will also enable this driver.

The relevant code has been unchanged since before the migration to
git (2.6.12).

This patch fixes bugzilla #9310 and was the root cause behind
http://lkml.org/lkml/2008/5/31/220.

Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: Antonino A. Daplas <adaplas@gmail.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Frans Pop 2008-07-23 21:31:26 -07:00 committed by Linus Torvalds
parent cfb4f5d175
commit b604838ac6
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/video/vfb.c
View file

@ -443,19 +443,29 @@ static int vfb_mmap(struct fb_info *info,
} }
#ifndef MODULE #ifndef MODULE
/*
* The virtual framebuffer driver is only enabled if explicitly
* requested by passing 'video=vfb:' (or any actual options).
*/
static int __init vfb_setup(char *options) static int __init vfb_setup(char *options)
{ {
char *this_opt; char *this_opt;
vfb_enable = 0;
if (!options)
return 1;
vfb_enable = 1; vfb_enable = 1;
if (!options || !*options) if (!*options)
return 1; return 1;
while ((this_opt = strsep(&options, ",")) != NULL) { while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt) if (!*this_opt)
continue; continue;
if (!strncmp(this_opt, "disable", 7)) /* Test disable for backwards compatibility */
if (!strcmp(this_opt, "disable"))
vfb_enable = 0; vfb_enable = 0;
} }
return 1; return 1;