Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 821d8017 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a29516b5 on remote branch

Change-Id: I7e23b9cb244a9c2f23a8afe3e371f3ae72c8c13b
parents d6919b6a a29516b5
Loading
Loading
Loading
Loading
+19 −21
Original line number Diff line number Diff line
@@ -9644,11 +9644,9 @@ int afe_spk_prot_feed_back_cfg(int src_port, int dst_port,
		}
		this_afe.v4_ch_map_cfg.num_channels = index;
		this_afe.num_spkrs = index / 2;
		pr_debug("%s no of channels: %d\n", __func__, index);
		this_afe.vi_tx_port = src_port;
		this_afe.vi_rx_port = dst_port;
		ret = 0;
	} else {
	}

	index = 0;
	memset(&prot_config, 0, sizeof(prot_config));
	prot_config.feedback_path_cfg.dst_portid =
		q6audio_get_port_id(dst_port);
@@ -9660,13 +9658,13 @@ int afe_spk_prot_feed_back_cfg(int src_port, int dst_port,
		prot_config.feedback_path_cfg.chan_info[index++] = 3;
		prot_config.feedback_path_cfg.chan_info[index++] = 4;
	}

	prot_config.feedback_path_cfg.num_channels = index;
	pr_debug("%s no of channels: %d\n", __func__, index);
	prot_config.feedback_path_cfg.minor_version = 1;
	ret = afe_spk_prot_prepare(src_port, dst_port,
			AFE_PARAM_ID_FEEDBACK_PATH_CFG, &prot_config,
			 sizeof(union afe_spkr_prot_config));
	}

fail_cmd:
	return ret;