summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Nathan <ralphnathan@google.com>2015-12-11 10:29:11 -0800
committerRalph Nathan <ralphnathan@google.com>2015-12-16 18:28:59 +0000
commit0c32667640202a3a73c9bce32460d8b837d1a735 (patch)
treeddfcf7978c72e61a5b4c045d1a4f24767f385045
parent4b7f0f53afdd02ea09891dd2e6d3d6a236e272d0 (diff)
downloadqcom-brillo-m8-dev.tar.gz
audio: Fix warning in hal/audio_extn/dolby.cbrillo-m8-dev
Fix error where the audio_extn_dolby_set_license function is supposed to return void but instead returns an int. BUG=none TEST=dragonboard builds. Change-Id: I071c93f838515bb9fade2b3d26f67a340fb8bde9 (cherry picked from commit c95745ec3867d527589915b38b417ec6b00f55ba)
-rw-r--r--audio/hal/audio_extn/dolby.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/hal/audio_extn/dolby.c b/audio/hal/audio_extn/dolby.c
index e1b64be..14a653e 100644
--- a/audio/hal/audio_extn/dolby.c
+++ b/audio/hal/audio_extn/dolby.c
@@ -639,10 +639,10 @@ int audio_extn_dolby_set_dap_bypass(struct audio_device *adev, int state) {
void audio_extn_dolby_set_license(struct audio_device *adev)
{
- int i_key=0;
+ int i_key = 0;
char c_key[128] = {0};
char c_dmid[128] = {0};
- int i_dmid, ret = -EINVAL;
+ int i_dmid = 0;
struct dolby_param_license dolby_license;
#ifdef DOLBY_ACDB_LICENSE
@@ -661,9 +661,9 @@ void audio_extn_dolby_set_license(struct audio_device *adev)
ds2extnmod.dap_hal_set_hw_info(DMID, (void*)(&dolby_license.dmid));
} else {
ALOGV("%s: dap_hal_set_hw_info is NULL", __func__);
- return ret;
+ return;
}
- return 0;
+ return;
}