Skip to content

Commit

Permalink
Initialize drivers/media/video/saa7134 late
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Torvalds committed Dec 21, 2005
1 parent 5a9191f commit c7ac6b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion drivers/media/video/saa7134/saa7134-alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
3 changes: 2 additions & 1 deletion drivers/media/video/saa7134/saa7134-oss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]");
Expand Down

0 comments on commit c7ac6b4

Please sign in to comment.