Commit 2999ff5b authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Fix a deadlock in snd-rtctimer 



Fix a occasional deadlock occuring with snd-rtctimer driver,
added irqsave to the lock in tasklet (ALSA bug#952).

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent f40b6890

sound/core/timer.c

+3 −2
Original line number Diff line number Diff line
@@ -628,8 +628,9 @@ static void snd_timer_tasklet(unsigned long arg) 
	struct snd_timer_instance *ti;

	struct list_head *p;

	unsigned long resolution, ticks;

	unsigned long flags;



	spin_lock(&timer->lock);

	spin_lock_irqsave(&timer->lock, flags);

	/* now process all callbacks */

	while (!list_empty(&timer->sack_list_head)) {

		p = timer->sack_list_head.next;		/* get first item */
@@ -649,7 +650,7 @@ static void snd_timer_tasklet(unsigned long arg) 
		spin_lock(&timer->lock);

		ti->flags &= ~SNDRV_TIMER_IFLG_CALLBACK;

	}

	spin_unlock(&timer->lock);

	spin_unlock_irqrestore(&timer->lock, flags);

}



/*