summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Herman <rene.herman@keyaccess.nl>2008-09-03 23:48:21 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-04 01:37:08 +0400
commitb54ff9398ac7d38a129167b580383943592b6f08 (patch)
treebd120e64a3c12654a1b2b639b6f0ab3204e939f7
parentf46466e7d6ff4871e5faae32d277175293a34c1f (diff)
downloadlinux-b54ff9398ac7d38a129167b580383943592b6f08.tar.xz
V4L/DVB (8727): V4L1: make PMS not autoprobe when builtin.
The old Mediavision Pro Movie Studio legacy ISA V4L1 driver was found to hang the boot during Ingo Molnar's testing of randconfig kernels. Have it require a "pms.enable=1" kernel parameter to enable the driver when builtin which avoids such problems. This is a deprecated and, very likely, unused driver. Nothing changes modular behaviour moreover. Signed-off-by: Rene Herman <rene.herman@gmail.com> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/pms.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 00425d743656..ede522a33d7d 100644
--- a/drivers/media/video/pms.c
+++ b/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())