aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/saa7134/saa7134-oss.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-21 14:52:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-21 14:52:32 -0800
commitc7ac6b42ffba28c350cbcd48268f46689f6eb1cc (patch)
tree51520d34b0fa957a80eb645f6f56bc561ec3d233 /drivers/media/video/saa7134/saa7134-oss.c
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/media/video/saa7134/saa7134-oss.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-oss.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 513a699a6df..c450d57b294 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)
return;
}
-module_init(saa7134_oss_init);
+/* We initialize this late, to make sure the sound system is up and running */
+late_initcall(saa7134_oss_init);
module_exit(saa7134_oss_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");