summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-20 16:44:51 -0700
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-20 16:44:51 -0700
commitaf1ffad29ae870b4615122850f829047d43dd0a8 (patch)
tree5f3e5d62133cf5e546aa7760f932a4023a94bc9d /linux/drivers
parent3e8019525a28bf5d9993fb2dfcff38f82ad071bb (diff)
downloadmediapointer-dvb-s2-af1ffad29ae870b4615122850f829047d43dd0a8.tar.gz
mediapointer-dvb-s2-af1ffad29ae870b4615122850f829047d43dd0a8.tar.bz2
V4L1: make PMS not autoprobe when builtin.
From: Rene Herman <rene.herman@keyaccess.nl> 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 'linux/drivers')
-rw-r--r--linux/drivers/media/video/pms.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pms.c b/linux/drivers/media/video/pms.c
index e36b39b44..7db7872d8 100644
--- a/linux/drivers/media/video/pms.c
+++ b/linux/drivers/media/video/pms.c
@@ -1020,10 +1020,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())