diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-alsa.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-oss.c | 8 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
3 files changed, 24 insertions, 2 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"); diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c index 25d9032db..6bb452c09 100644 --- a/linux/drivers/media/video/saa7134/saa7134-oss.c +++ b/linux/drivers/media/video/saa7134/saa7134-oss.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-oss.c,v 1.32 2005/12/20 17:10:17 rmcc Exp $ + * $Id: saa7134-oss.c,v 1.33 2005/12/21 22:47:35 rmcc Exp $ * * device driver for philips saa7134 based TV cards * oss dsp interface @@ -1034,7 +1034,13 @@ static void saa7134_oss_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_oss_init); +*/ + +late_initcall(saa7134_oss_init); module_exit(saa7134_oss_exit); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 18ca4b29c..7a75fb0e8 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-12-21 22:43 rmcc + + * linux/drivers/media/video/saa7134/saa7134-alsa.c: + * linux/drivers/media/video/saa7134/saa7134-oss.c: + + - Changed saa7134 DMA sound modules to late_initcall() to + prevent oops-on-boot in static kernels. + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-12-21 05:57 mkrufky * v4l/insmod.sh: |