summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-alsa.c
diff options
context:
space:
mode:
authorRicardo Cerqueira <devnull@localhost>2005-12-21 22:47:35 +0000
committerRicardo Cerqueira <devnull@localhost>2005-12-21 22:47:35 +0000
commit4f42d6cfd51e4cab7cc810d2b7ae00ee58382b09 (patch)
tree799d7f30a53d20b836b07878cb791a3cb1020a45 /linux/drivers/media/video/saa7134/saa7134-alsa.c
parent66c8f19be7ed8c5cb6152ac7ef987fd3d863ec30 (diff)
downloadmediapointer-dvb-s2-4f42d6cfd51e4cab7cc810d2b7ae00ee58382b09.tar.gz
mediapointer-dvb-s2-4f42d6cfd51e4cab7cc810d2b7ae00ee58382b09.tar.bz2
Changes saa7134 DMA sound modules to late_initcall() to prevent oops
From: Ricardo Cerqueira <v4l@cerqueira.org> Replaced module_init() with late_initcall() so sound core can be loaded before these modules, to prevent an oops when booting with them statically compiled into the kernel. Signed-off-by:
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-alsa.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-alsa.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index d05c519d4..5761c38cd 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -1,7 +1,7 @@
/*
* SAA713x ALSA support for V4L
*
- * $Id: saa7134-alsa.c,v 1.32 2005/12/20 17:10:17 rmcc Exp $
+ * $Id: saa7134-alsa.c,v 1.33 2005/12/21 22:47:35 rmcc Exp $
*
* Caveats:
* - Volume doesn't work (it's always at max)
@@ -1046,7 +1046,13 @@ static void saa7134_alsa_exit(void)
return;
}
+/*
+ This is here as a temporary fix until the sound core is loaded earlier
+ in the boot process. It should be
module_init(saa7134_alsa_init);
+*/
+
+late_initcall(saa7134_alsa_init);
module_exit(saa7134_alsa_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Ricardo Cerqueira");