A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "asoc: modify the ref_count check for substream"

Browse source
This commit is contained in:
qctecmdr 2021-02-11 20:36:33 -08:00 • committed by Gerrit - the friendly Code Review server
commit fc6c5e98b8
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
asoc/msm-pcm-loopback-v2.c
View file

@ -1,5 +1,5 @@
// 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);

6
asoc/msm-pcm-q6-v2.c
View file

@ -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);