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

Commit fc6c5e98 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: modify the ref_count check for substream"

parents 9735cce4 c5892fcc

asoc/msm-pcm-loopback-v2.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/init.h>
@@ -950,7 +950,7 @@ static int msm_pcm_channel_mixer_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
			chmixer_pspd);



	mutex_lock(&loopback_session_lock);

	if (substream->ref_count <= 0) {

	if (substream->runtime && substream->ref_count <= 0) {

		pr_err_ratelimited("%s: substream ref_count:%d invalid\n",

				__func__, substream->ref_count);

		mutex_unlock(&loopback_session_lock);

asoc/msm-pcm-q6-v2.c

+3 −3
Original line number Diff line number Diff line
@@ -1862,7 +1862,7 @@ static int msm_pcm_chmap_ctl_put(struct snd_kcontrol *kcontrol, 
		return 0;



	mutex_lock(&pdata->lock);

	if (substream->ref_count <= 0) {

	if (substream->runtime && substream->ref_count <= 0) {

		pr_err_ratelimited("%s: substream ref_count:%d invalid\n",

				__func__, substream->ref_count);

		mutex_unlock(&pdata->lock);
@@ -1935,7 +1935,7 @@ static int msm_pcm_chmap_ctl_get(struct snd_kcontrol *kcontrol, 
		return 0; /* no channels set */



	mutex_lock(&pdata->lock);

	if (substream->ref_count <= 0) {

	if (substream->runtime && substream->ref_count <= 0) {

		pr_err_ratelimited("%s: substream ref_count:%d invalid\n",

				__func__, substream->ref_count);

		mutex_unlock(&pdata->lock);
@@ -2240,7 +2240,7 @@ static int msm_pcm_channel_mixer_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
	}



	mutex_lock(&pdata->lock);

	if (substream->ref_count <= 0) {

	if (substream->runtime && substream->ref_count <= 0) {

		pr_err_ratelimited("%s: substream ref_count:%d invalid\n",

				__func__, substream->ref_count);

		mutex_unlock(&pdata->lock);