Attachment #153093 for bug #222025




	}
	spin_unlock_irqrestore(&clients_lock, flags);
#ifdef CONFIG_KMOD
	if (!in_interrupt()) {
		static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS];
		static char card_requested[SNDRV_CARDS];
		if (clientid < SNDRV_SEQ_GLOBAL_CLIENTS) {
			int idx;
			
			if (!client_requested[clientid]) {
				client_requested[clientid] = 1;
				for (idx = 0; idx < 15; idx++) {
					if (seq_client_load[idx] < 0)

Lines 147-155 void snd_seq_device_load_drivers(void) Link Here

(-)a/core/seq/seq_device.c (-3 lines)
147	* may cause blocking.	147	* may cause blocking.
148	*/	148	*/
149	if (snd_seq_in_init)	149	if (snd_seq_in_init)
150	return;
151
152	if (! current->fs->root)
153	return;	150	return;
154		151
155	mutex_lock(&ops_mutex);	152	mutex_lock(&ops_mutex);




 */
void snd_request_card(int card)
{
	if (! current->fs->root)
		return;
	if (snd_card_locked(card))
		return;
	if (card < 0 || card >= cards_limit)

{
	char *str;

	if (! current->fs->root)
		return;
	switch (minor) {
	case SNDRV_MINOR_SEQUENCER:	str = "snd-seq";	break;
	case SNDRV_MINOR_TIMER:		str = "snd-timer";	break;

Lines 150-157 static struct snd_timer *snd_timer_find( Link Here

(-)a/core/timer.c (-2 lines)
150		150
151	static void snd_timer_request(struct snd_timer_id *tid)	151	static void snd_timer_request(struct snd_timer_id *tid)
152	{	152	{
153	if (! current->fs->root)
154	return;
155	switch (tid->dev_class) {	153	switch (tid->dev_class) {
156	case SNDRV_TIMER_CLASS_GLOBAL:	154	case SNDRV_TIMER_CLASS_GLOBAL:
157	if (tid->device < timer_limit)	155	if (tid->device < timer_limit)

Lines 250-258 int __init snd_pmac_daca_init(struct snd Link Here

(-)a/ppc/daca.c (-3 / +2 lines)
250	struct pmac_daca *mix;	250	struct pmac_daca *mix;
251		251
252	#ifdef CONFIG_KMOD	252	#ifdef CONFIG_KMOD
253	if (current->fs->root)	253	request_module("i2c-powermac");
254	request_module("i2c-powermac");	254	#endif /* CONFIG_KMOD */
255	#endif /* CONFIG_KMOD */
256		255
257	mix = kzalloc(sizeof(*mix), GFP_KERNEL);	256	mix = kzalloc(sizeof(*mix), GFP_KERNEL);
258	if (! mix)	257	if (! mix)

Lines 1351-1359 int __init snd_pmac_tumbler_init(struct Link Here

(-)a/ppc/tumbler.c (-3 / +2 lines)
1351	char *chipname;	1351	char *chipname;
1352		1352
1353	#ifdef CONFIG_KMOD	1353	#ifdef CONFIG_KMOD
1354	if (current->fs->root)	1354	request_module("i2c-powermac");
1355	request_module("i2c-powermac");	1355	#endif /* CONFIG_KMOD */
1356	#endif /* CONFIG_KMOD */
1357		1356
1358	mix = kzalloc(sizeof(*mix), GFP_KERNEL);	1357	mix = kzalloc(sizeof(*mix), GFP_KERNEL);
1359	if (! mix)	1358	if (! mix)

Return to bug 222025

Lines 71-78 static DEFINE_MUTEX(sound_mutex); Link Here

(-)a/core/sound.c (-4 lines)
71	*/	71	*/
72	void snd_request_card(int card)	72	void snd_request_card(int card)
73	{	73	{
74	if (! current->fs->root)
75	return;
76	if (snd_card_locked(card))	74	if (snd_card_locked(card))
77	return;	75	return;
78	if (card < 0 \|\| card >= cards_limit)	76	if (card < 0 \|\| card >= cards_limit)
Lines 86-93 static void snd_request_other(int minor) Link Here
86	{	84	{
87	char *str;	85	char *str;
88		86
89	if (! current->fs->root)
90	return;
91	switch (minor) {	87	switch (minor) {
92	case SNDRV_MINOR_SEQUENCER: str = "snd-seq"; break;	88	case SNDRV_MINOR_SEQUENCER: str = "snd-seq"; break;
93	case SNDRV_MINOR_TIMER: str = "snd-timer"; break;	89	case SNDRV_MINOR_TIMER: str = "snd-timer"; break;

Lines 149-161 struct snd_seq_client *snd_seq_client_us Link Here

(-)a/core/seq/seq_clientmgr.c (-2 / +2 lines)
149	}	149	}
150	spin_unlock_irqrestore(&clients_lock, flags);	150	spin_unlock_irqrestore(&clients_lock, flags);
151	#ifdef CONFIG_KMOD	151	#ifdef CONFIG_KMOD
152	if (!in_interrupt() && current->fs->root) {	152	if (!in_interrupt()) {
153	static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS];	153	static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS];
154	static char card_requested[SNDRV_CARDS];	154	static char card_requested[SNDRV_CARDS];
155	if (clientid < SNDRV_SEQ_GLOBAL_CLIENTS) {	155	if (clientid < SNDRV_SEQ_GLOBAL_CLIENTS) {
156	int idx;	156	int idx;
157		157
158	if (! client_requested[clientid] && current->fs->root) {	158	if (!client_requested[clientid]) {
159	client_requested[clientid] = 1;	159	client_requested[clientid] = 1;
160	for (idx = 0; idx < 15; idx++) {	160	for (idx = 0; idx < 15; idx++) {
161	if (seq_client_load[idx] < 0)	161	if (seq_client_load[idx] < 0)