diff options
| author | Siena Richard <sienar@codeaurora.org> | 2016-12-15 15:22:25 -0800 |
|---|---|---|
| committer | Siena Richard <sienar@codeaurora.org> | 2017-01-20 15:46:41 -0800 |
| commit | 965fe514e0c1fcdb8dca608fcb875f73afe9ec31 (patch) | |
| tree | 96690b2c8e0d6d403fcf6e2d63344a0c7d0cf41c | |
| parent | 74e7bd58a41c72e94474eed114eb58ae6362e735 (diff) | |
msm: qdsp6v2: remove invalid sample rate check for ADM topology
Remove the check on sample rate when searching for the correct ADM
topology. The ADM topology is not dependent on sample rate and the
sample rate is not set by calibration in the ADM topology calibration
information header. Therefore, it is invalid data and should not be
used to determine the ADM topology.
Change-Id: Iea0a53409ae95c89b6a984a679374cab19cc5602
Signed-off-by: Siena Richard <sienar@codeaurora.org>
CRs-fixed: 1110369
| -rw-r--r-- | sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c index 485ffa06f5bd..72322d393530 100644 --- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c +++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c @@ -721,8 +721,7 @@ static struct cal_block_data *msm_routing_find_topology_by_path(int path) static struct cal_block_data *msm_routing_find_topology(int path, int app_type, - int acdb_id, - int sample_rate) + int acdb_id) { struct list_head *ptr, *next; struct cal_block_data *cal_block = NULL; @@ -739,13 +738,12 @@ static struct cal_block_data *msm_routing_find_topology(int path, cal_block->cal_info; if ((cal_info->path == path) && (cal_info->app_type == app_type) && - (cal_info->acdb_id == acdb_id) && - (cal_info->sample_rate == sample_rate)) { + (cal_info->acdb_id == acdb_id)) { return cal_block; } } - pr_debug("%s: Can't find topology for path %d, app %d, acdb_id %d sample_rate %d defaulting to search by path\n", - __func__, path, app_type, acdb_id, sample_rate); + pr_debug("%s: Can't find topology for path %d, app %d, acdb_id %d defaulting to search by path\n", + __func__, path, app_type, acdb_id); return msm_routing_find_topology_by_path(path); } @@ -754,7 +752,7 @@ static int msm_routing_get_adm_topology(int path, int fedai_id, { int topology = NULL_COPP_TOPOLOGY; struct cal_block_data *cal_block = NULL; - int app_type = 0, acdb_dev_id = 0, sample_rate = 0; + int app_type = 0, acdb_dev_id = 0; pr_debug("%s\n", __func__); path = get_cal_path(path); @@ -765,10 +763,8 @@ static int msm_routing_get_adm_topology(int path, int fedai_id, app_type = fe_dai_app_type_cfg[fedai_id][session_type].app_type; acdb_dev_id = fe_dai_app_type_cfg[fedai_id][session_type].acdb_dev_id; - sample_rate = fe_dai_app_type_cfg[fedai_id][session_type].sample_rate; - cal_block = msm_routing_find_topology(path, app_type, - acdb_dev_id, sample_rate); + cal_block = msm_routing_find_topology(path, app_type, acdb_dev_id); if (cal_block == NULL) goto unlock; |