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-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "asoc: add return value check for channel mapping function"

Browse source
This commit is contained in:
qctecmdr 2022-10-11 23:29:07 -07:00 • committed by Gerrit - the friendly Code Review server
commit c37ebe7169
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -964,8 +964,13 @@ static int msm_pcm_channel_mixer_cfg_ctl_put(struct snd_kcontrol *kcontrol,
__func__, chmixer_pspd->input_channel);
return -EINVAL;
}
q6asm_map_channels(asm_ch_map,
ret = q6asm_map_channels(asm_ch_map,
chmixer_pspd->input_channel, false);
if (ret < 0) {
pr_err("%s q6asm_map_channels failed\n", __func__);
return ret;
}
for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL_V8; i++)
chmixer_pspd->in_ch_map[i] = asm_ch_map[i];
chmixer_pspd->override_in_ch_map = true;
@ -977,8 +982,12 @@ static int msm_pcm_channel_mixer_cfg_ctl_put(struct snd_kcontrol *kcontrol,
__func__, chmixer_pspd->output_channel);
return -EINVAL;
}
q6asm_map_channels(asm_ch_map,
ret = q6asm_map_channels(asm_ch_map,
chmixer_pspd->output_channel, false);
if (ret < 0) {
pr_err("%s q6asm_map_channels failed\n", __func__);
return ret;
}
for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL_V8; i++)
chmixer_pspd->out_ch_map[i] = asm_ch_map[i];
chmixer_pspd->override_out_ch_map = true;