aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-21 17:52:32 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-21 17:52:32 -0500
commitc7ac6b42ffba28c350cbcd48268f46689f6eb1cc (patch)
tree51520d34b0fa957a80eb645f6f56bc561ec3d233 /drivers
parent5a9191ff683ce4ebfd2c6a15e2989f5b1f420321 (diff)
Initialize drivers/media/video/saa7134 late
When compiled-in, make sure the sound system has initialized before these drivers do. Reported by Adrian Bunk <bunk@stusta.de> (The right fix would be to make the sound core use "subsys_initcall()" and thus initialize before all normal drivers, but this is the quick and limited safe fix for 2.6.15). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c3
-rw-r--r--drivers/media/video/saa7134/saa7134-oss.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 953d5fec82d5..6752dd1c1e8a 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -1028,7 +1028,8 @@ static void saa7134_alsa_exit(void)
1028 return; 1028 return;
1029} 1029}
1030 1030
1031module_init(saa7134_alsa_init); 1031/* We initialize this late, to make sure the sound system is up and running */
1032late_initcall(saa7134_alsa_init);
1032module_exit(saa7134_alsa_exit); 1033module_exit(saa7134_alsa_exit);
1033MODULE_LICENSE("GPL"); 1034MODULE_LICENSE("GPL");
1034MODULE_AUTHOR("Ricardo Cerqueira"); 1035MODULE_AUTHOR("Ricardo Cerqueira");
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 513a699a6df2..c450d57b2949 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -1002,7 +1002,8 @@ static void saa7134_oss_exit(void)
1002 return; 1002 return;
1003} 1003}
1004 1004
1005module_init(saa7134_oss_init); 1005/* We initialize this late, to make sure the sound system is up and running */
1006late_initcall(saa7134_oss_init);
1006module_exit(saa7134_oss_exit); 1007module_exit(saa7134_oss_exit);
1007MODULE_LICENSE("GPL"); 1008MODULE_LICENSE("GPL");
1008MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 1009MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");