Commit 9bc889b4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm: Update the state properly before notification 



Some state changes (e.g. snd_pcm_stop()) sets the runtime state after
calling snd_timer_notify().  This is basically racy, since the
notification may wakes up the user even before the state change.
Although the possibility is low, we should set the state before the
notifications.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 19566b0b

sound/core/pcm_native.c

+4 −4
Original line number Diff line number Diff line
@@ -1052,10 +1052,10 @@ static void snd_pcm_post_stop(struct snd_pcm_substream *substream, int state) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	if (runtime->status->state != state) {

		snd_pcm_trigger_tstamp(substream);

		runtime->status->state = state;

		if (substream->timer)

			snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSTOP,

					 &runtime->trigger_tstamp);

		runtime->status->state = state;

	}

	wake_up(&runtime->sleep);

	wake_up(&runtime->tsleep);
@@ -1204,11 +1204,11 @@ static void snd_pcm_post_suspend(struct snd_pcm_substream *substream, int state) 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	snd_pcm_trigger_tstamp(substream);

	runtime->status->suspended_state = runtime->status->state;

	runtime->status->state = SNDRV_PCM_STATE_SUSPENDED;

	if (substream->timer)

		snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSUSPEND,

				 &runtime->trigger_tstamp);

	runtime->status->suspended_state = runtime->status->state;

	runtime->status->state = SNDRV_PCM_STATE_SUSPENDED;

	wake_up(&runtime->sleep);

	wake_up(&runtime->tsleep);

}
@@ -1311,10 +1311,10 @@ static void snd_pcm_post_resume(struct snd_pcm_substream *substream, int state) 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	snd_pcm_trigger_tstamp(substream);

	runtime->status->state = runtime->status->suspended_state;

	if (substream->timer)

		snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MRESUME,

				 &runtime->trigger_tstamp);

	runtime->status->state = runtime->status->suspended_state;

}



static struct action_ops snd_pcm_action_resume = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE