From f2f68463a7cbd71fc78172d01c649683a73e5de8 Mon Sep 17 00:00:00 2001 From: Xiaojun Sang Date: Wed, 30 Jan 2019 10:43:04 +0800 Subject: [PATCH] adm: undo echo reference rx value reset after open echo reference value reset after open leads to second SVA session without echo. Undo the value reset. Change-Id: Ie6ae357108beed0c8f034a3408c494475376e486 Signed-off-by: Xiaojun Sang --- dsp/q6adm.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dsp/q6adm.c b/dsp/q6adm.c index 2a3a47f7992f..7b4b049e99f2 100644 --- a/dsp/q6adm.c +++ b/dsp/q6adm.c @@ -2907,7 +2907,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 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__, @@ -2951,7 +2950,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, if (this_adm.ec_ref_rx_bit_width != 0) { ep2_payload.bit_width = this_adm.ec_ref_rx_bit_width; - this_adm.ec_ref_rx_bit_width = 0; } else { ep2_payload.bit_width = bit_width; } @@ -2959,7 +2957,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, if (this_adm.ec_ref_rx_sampling_rate != 0) { ep2_payload.sample_rate = this_adm.ec_ref_rx_sampling_rate; - this_adm.ec_ref_rx_sampling_rate = 0; } else { ep2_payload.sample_rate = rate; } @@ -3029,7 +3026,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, if (this_adm.ec_ref_rx && (path != 1) && (afe_get_port_type(tmp_port) == MSM_AFE_PORT_TYPE_TX)) { open.endpoint_id_2 = this_adm.ec_ref_rx; - this_adm.ec_ref_rx = -1; } open.topology_id = topology; @@ -3061,12 +3057,10 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, open_v6.hdr.pkt_size = sizeof(open_v6); open_v6.dev_num_channel_eid2 = this_adm.num_ec_ref_rx_chans; - this_adm.num_ec_ref_rx_chans = 0; if (this_adm.ec_ref_rx_bit_width != 0) { open_v6.bit_width_eid2 = this_adm.ec_ref_rx_bit_width; - this_adm.ec_ref_rx_bit_width = 0; } else { open_v6.bit_width_eid2 = bit_width; } @@ -3074,7 +3068,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, if (this_adm.ec_ref_rx_sampling_rate != 0) { open_v6.sample_rate_eid2 = this_adm.ec_ref_rx_sampling_rate; - this_adm.ec_ref_rx_sampling_rate = 0; } else { open_v6.sample_rate_eid2 = rate; }