duff/android_kernel_motorola_sm6225
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SoC: codecs: Fix slim_tx port configuration for wcd9335"

Browse Source
This commit is contained in:
qctecmdr authored and Gerrit - the friendly Code Review server committed 2021-06-19 10:29:48 -07:00
2 parents 770c810a62 fc259a0085
commit 0879ae52eb
1 file changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files
asoc/codecs/wcd9335.c
+5 -4
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2019, 2021, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
#include <linux/init.h>
@@ -2430,9 +2430,9 @@ static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol,
mutex_lock(&tasha_p->codec_mutex);
if (tasha_p->intf_type == WCD9XXX_INTERFACE_TYPE_SLIMBUS) {
if (dai_id != AIF1_CAP) {
dev_err(component->dev, "%s: invalid AIF for I2C mode\n",
__func__);
if (dai_id >= ARRAY_SIZE(vport_slim_check_table)) {
dev_err(component->dev, "%s: dai_id: %d, out of bounds\n",
__func__, dai_id);
mutex_unlock(&tasha_p->codec_mutex);
return -EINVAL;
}
@@ -2441,6 +2441,7 @@ static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol,
if (dai_id >= ARRAY_SIZE(vport_i2s_check_table)) {
dev_err(component->dev, "%s: dai_id: %d, out of bounds\n",
__func__, dai_id);
mutex_unlock(&tasha_p->codec_mutex);
return -EINVAL;
}
vtable = vport_i2s_check_table[dai_id];