aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorRene Herman <rene.herman@keyaccess.nl>2008-09-03 15:48:21 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-03 17:37:08 -0400
commitb54ff9398ac7d38a129167b580383943592b6f08 (patch)
treebd120e64a3c12654a1b2b639b6f0ab3204e939f7 /drivers/media/video
parentf46466e7d6ff4871e5faae32d277175293a34c1f (diff)
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>
Diffstat (limited to 'drivers/media/video')
-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)
1019 * Initialization and module stuff 1019 * Initialization and module stuff
1020 */ 1020 */
1021 1021
1022#ifndef MODULE
1023static int enable;
1024module_param(enable, int, 0);
1025#endif
1026
1022static int __init init_pms_cards(void) 1027static int __init init_pms_cards(void)
1023{ 1028{
1024 printk(KERN_INFO "Mediavision Pro Movie Studio driver 0.02\n"); 1029 printk(KERN_INFO "Mediavision Pro Movie Studio driver 0.02\n");
1025 1030
1031#ifndef MODULE
1032 if (!enable) {
1033 printk(KERN_INFO "Not enabled\n");
1034 return -ENODEV;
1035 }
1036#endif
1037
1026 data_port = io_port +1; 1038 data_port = io_port +1;
1027 1039
1028 if(init_mediavision()) 1040 if(init_mediavision())