Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7ac6b42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5a9191ff

drivers/media/video/saa7134/saa7134-alsa.c

+2 −1
Original line number Diff line number Diff line
@@ -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");

drivers/media/video/saa7134/saa7134-oss.c

+2 −1
Original line number Diff line number Diff line
@@ -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]");