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

Commit 0ea83a2b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ALSA: pcm: use lock to protect substream runtime resource"

parents 1cf46383 02ff61a1

sound/core/pcm.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -756,6 +756,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count) 
		}

		}

		substream->group = &substream->self_group;

		substream->group = &substream->self_group;

		spin_lock_init(&substream->self_group.lock);

		spin_lock_init(&substream->self_group.lock);

		spin_lock_init(&substream->runtime_lock);

		mutex_init(&substream->self_group.mutex);

		mutex_init(&substream->self_group.mutex);

		INIT_LIST_HEAD(&substream->self_group.substreams);

		INIT_LIST_HEAD(&substream->self_group.substreams);

		list_add_tail(&substream->link_list, &substream->self_group.substreams);

		list_add_tail(&substream->link_list, &substream->self_group.substreams);
@@ -1047,9 +1048,11 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, 
void snd_pcm_detach_substream(struct snd_pcm_substream *substream)

void snd_pcm_detach_substream(struct snd_pcm_substream *substream)

{

{

	struct snd_pcm_runtime *runtime;

	struct snd_pcm_runtime *runtime;

	unsigned long flags = 0;





	if (PCM_RUNTIME_CHECK(substream))

	if (PCM_RUNTIME_CHECK(substream))

		return;

		return;

	spin_lock_irqsave(&substream->runtime_lock, flags);

	runtime = substream->runtime;

	runtime = substream->runtime;

	if (runtime->private_free != NULL)

	if (runtime->private_free != NULL)

		runtime->private_free(runtime);

		runtime->private_free(runtime);
@@ -1063,6 +1066,7 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream) 
	put_pid(substream->pid);

	put_pid(substream->pid);

	substream->pid = NULL;

	substream->pid = NULL;

	substream->pstr->substream_opened--;

	substream->pstr->substream_opened--;

	spin_unlock_irqrestore(&substream->runtime_lock, flags);

}

}





static ssize_t show_pcm_class(struct device *dev,

static ssize_t show_pcm_class(struct device *dev,

sound/core/pcm_timer.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -67,9 +67,16 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) 
static unsigned long snd_pcm_timer_resolution(struct snd_timer * timer)

static unsigned long snd_pcm_timer_resolution(struct snd_timer * timer)

{

{

	struct snd_pcm_substream *substream;

	struct snd_pcm_substream *substream;

	unsigned long ret = 0, flags = 0;





	substream = timer->private_data;

	substream = timer->private_data;

	return substream->runtime ? substream->runtime->timer_resolution : 0;

	spin_lock_irqsave(&substream->runtime_lock, flags);

	if (substream->runtime)

		ret = substream->runtime->timer_resolution;

	else

		ret = 0;

	spin_unlock_irqrestore(&substream->runtime_lock, flags);

	return ret;

}

}





static int snd_pcm_timer_start(struct snd_timer * timer)

static int snd_pcm_timer_start(struct snd_timer * timer)