From 3c606b830f36b5ee34a7d26a90a7638623c70c0f Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 21 Dec 2005 14:52:32 -0800 Subject: [PATCH] --- yaml --- r: 15279 b: refs/heads/master c: c7ac6b42ffba28c350cbcd48268f46689f6eb1cc h: refs/heads/master i: 15277: c11b0e31aaf1d2a93a3f3cb972432eec1cef513a 15275: b129fe74e94124e906c963091768186388ee0a2c 15271: 8302b8b1662163ecb0335ec821427b070567a31b 15263: a36770f00d94f22dd53ffccfe06b3f1bcc2b6e72 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-alsa.c | 3 ++- trunk/drivers/media/video/saa7134/saa7134-oss.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2662aeca6b89..fca0d7b26305 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a9191ff683ce4ebfd2c6a15e2989f5b1f420321 +refs/heads/master: c7ac6b42ffba28c350cbcd48268f46689f6eb1cc diff --git a/trunk/drivers/media/video/saa7134/saa7134-alsa.c b/trunk/drivers/media/video/saa7134/saa7134-alsa.c index 953d5fec82d5..6752dd1c1e8a 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-alsa.c +++ b/trunk/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/trunk/drivers/media/video/saa7134/saa7134-oss.c b/trunk/drivers/media/video/saa7134/saa7134-oss.c index 513a699a6df2..c450d57b2949 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-oss.c +++ b/trunk/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 [SuSE Labs]");