---

yaml --- r: 109546 b: refs/heads/master c: b54ff93 h: refs/heads/master v: v3
git-mirror · Sep 3, 2008 · 1a7d013 · 1a7d013
1 parent 1f6bf35
commit 1a7d013
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f46466e7d6ff4871e5faae32d277175293a34c1f
+refs/heads/master: b54ff9398ac7d38a129167b580383943592b6f08
diff --git a/trunk/drivers/media/video/pms.c b/trunk/drivers/media/video/pms.c
@@ -1019,10 +1019,22 @@ static int init_mediavision(void)
  *	Initialization and module stuff
  */
 
+#ifndef MODULE
+static int enable;
+module_param(enable, int, 0);
+#endif
+
 static int __init init_pms_cards(void)
 {
 	printk(KERN_INFO "Mediavision Pro Movie Studio driver 0.02\n");
 
+#ifndef MODULE
+	if (!enable) {
+		printk(KERN_INFO "Not enabled\n");
+		return -ENODEV;
+	}
+#endif
+
 	data_port = io_port +1;
 
 	if(init_mediavision())