diff options
author | D. Andrei Măceș <dmaces@nd.edu> | 2018-01-16 21:26:06 +0200 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 20:01:35 +0200 |
commit | bd5cde190dd90581797542e6a88f548ecbd56411 (patch) | |
tree | ee97993e20472d64837d34b6a1d053b3c22a6cb4 | |
parent | 50600553c70b771afb072558b029c89d681c9289 (diff) | |
download | android_hardware_qcom_audio-bd5cde190dd90581797542e6a88f548ecbd56411.tar.gz android_hardware_qcom_audio-bd5cde190dd90581797542e6a88f548ecbd56411.tar.bz2 android_hardware_qcom_audio-bd5cde190dd90581797542e6a88f548ecbd56411.zip |
audio: Make CVD version retrieval nonfatal with ACDB v1
This information is only needed at the initialization of ACDB v[23].
Change-Id: I5bbd99d661c55ca623cbe8fb56b54f29888de47c
Signed-off-by: D. Andrei Măceș <andrei@unlegacy-android.org>
-rw-r--r-- | hal/acdb.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -99,7 +99,13 @@ int acdb_init(int snd_card_num) ctl = mixer_get_ctl_by_name(mixer, CVD_VERSION_MIXER_CTL); if (!ctl) { ALOGE("%s: Could not get ctl for mixer cmd - %s", __func__, CVD_VERSION_MIXER_CTL); - goto cleanup; + /* CVD is required for ACDB v2/3, so fail fully there. + * For ACDB v1, the CVD version code can be skipped. + */ + if (my_data->acdb_init_v2 || my_data->acdb_init_v3) + goto cleanup; + else + goto card_name; } mixer_ctl_update(ctl); @@ -114,6 +120,7 @@ int acdb_init(int snd_card_num) } } +card_name: /* Get Sound card name */ snd_card_name = strdup(mixer_get_name(mixer)); if (!snd_card_name) { |