samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "dsp: update EC reference port only if channels are configured"

Browse Source
This commit is contained in:
Linux Build Service Account
2019-01-06 06:32:04 -08:00
committed by Gerrit - the friendly Code Review server
parent a43f819ec7 de79a06acf
commit 624abc38c9
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dsp/q6adm.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
#include <linux/slab.h>
@@ -2943,9 +2943,18 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology,
open_v8.endpoint_id_2 = 0xFFFF;
open_v8.endpoint_id_3 = 0xFFFF;
if (this_adm.ec_ref_rx && (path != ADM_PATH_PLAYBACK)) {
open_v8.endpoint_id_2 = this_adm.ec_ref_rx;
this_adm.ec_ref_rx = -1;
if ((this_adm.ec_ref_rx != -1) &&
(path != ADM_PATH_PLAYBACK)) {
if (this_adm.num_ec_ref_rx_chans != 0) {
open_v8.endpoint_id_2 =
this_adm.ec_ref_rx;
this_adm.ec_ref_rx = -1;
} else {
pr_err("%s: EC channels not set %d\n",
__func__,
this_adm.num_ec_ref_rx_chans);
return -EINVAL;
}
}
open_v8.topology_id = topology;