From: Frans Pop <elendil@planet.nl>
To: linux-fbdev-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
"Antonino A. Daplas" <adaplas@gmail.com>
Subject: [VIDEO] vfb: only enable if explicitly requested when compiled in
Date: Sun, 1 Jun 2008 14:54:22 +0200 [thread overview]
Message-ID: <200806011454.23123.elendil@planet.nl> (raw)
From: Frans Pop <elendil@planet.nl>
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.
Signed-off-by: Frans Pop <elendil@planet.nl>
CC: Antonino A. Daplas <adaplas@gmail.com>
CC: Andrew Morton <akpm@linux-foundation.org>
---
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.
My confusion stemmed from the fact that I was still assuming that the
Kconfig help would be correct (even though Antonino had already
determined it was not: http://lkml.org/lkml/2007/10/14/25, but somehow
my brain never parsed that).
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 072638a..51e935f 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -443,19 +443,29 @@ static int vfb_mmap(struct fb_info *info,
}
#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)
{
char *this_opt;
- vfb_enable = 1;
+ vfb_enable = 0;
- if (!options || !*options)
+ if (!options)
+ return 1;
+
+ vfb_enable = 1;
+
+ if (!*options)
return 1;
while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt)
continue;
- if (!strncmp(this_opt, "disable", 7))
+ /* Test disable for backwards compatibility */
+ if (!strcmp(this_opt, "disable"))
vfb_enable = 0;
}
return 1;
next reply other threads:[~2008-06-01 12:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-01 12:54 Frans Pop [this message]
2008-06-02 16:56 ` [Linux-fbdev-devel] " Krzysztof Helt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200806011454.23123.elendil@planet.nl \
--to=elendil@planet.nl \
--cc=adaplas@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fbdev-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®