diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-21 14:52:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-21 14:52:32 -0800 |
| commit | c7ac6b42ffba28c350cbcd48268f46689f6eb1cc (patch) | |
| tree | 51520d34b0fa957a80eb645f6f56bc561ec3d233 | |
| parent | 5a9191ff683ce4ebfd2c6a15e2989f5b1f420321 (diff) | |
| download | op-kernel-dev-c7ac6b42ffba28c350cbcd48268f46689f6eb1cc.zip op-kernel-dev-c7ac6b42ffba28c350cbcd48268f46689f6eb1cc.tar.gz | |
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>
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 3 | ||||
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-oss.c | 3 |
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 953d5fe..6752dd1 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) return; } -module_init(saa7134_alsa_init); +/* We initialize this late, to make sure the sound system is up and running */ +late_initcall(saa7134_alsa_init); module_exit(saa7134_alsa_exit); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Ricardo Cerqueira"); diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index 513a699..c450d57 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]"); |
