vfb: only enable if explicitly requested when compiled in

[pandora-kernel.git] / drivers / video / vfb.c

diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 072638a..93fe08d 100644 (file)
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -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)
 {
        char *this_opt;
 
 static int __init vfb_setup(char *options)
 {
        char *this_opt;
 

+       vfb_enable = 0;
+
+       if (!options)
+               return 1;
+

        vfb_enable = 1;
 
        vfb_enable = 1;
 

-       if (!options || !*options)
+       if (!*options)

                return 1;
 
        while ((this_opt = strsep(&options, ",")) != NULL) {
                if (!*this_opt)
                        continue;
                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;
                        vfb_enable = 0;
        }
        return 1;