commit 7780106b569a2daa71ea28b48e20ca4314b07501
author android-build-team Robot <android-build-team-robot@google.com> Sat May 05 02:12:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 05 02:12:25 2018 +0000
tree 10d18b707c237155db4d33d5dda9f749e58ec0c5
parent 196df23d1c89de75fca5ec27d0138b109bf48844
parent 5e7119c552847a3098f3a92445ef27f3f8088508

Merge "audio: Handle missing / tainted calibration file" into pi-dev

hal/audio_extn/cirrus_playback.c

diff --git a/hal/audio_extn/cirrus_playback.c b/hal/audio_extn/cirrus_playback.c
index 7c5d4c2..1fd8984 100644
--- a/hal/audio_extn/cirrus_playback.c
+++ b/hal/audio_extn/cirrus_playback.c
@@ -284,10 +284,9 @@
 
         cal_file = fopen(CRUS_CAL_FILE, "wb");
         if (cal_file == NULL) {
-            ALOGE("%s: Cannot create Cirrus SP calibration file (%s)",
+            ALOGE("%s: Cannot create Cirrus SP calibration file (%s), write cal value to dsp",
                   __func__, strerror(errno));
-            ret = -EINVAL;
-            goto exit;
+            goto write_dsp;
         }
 
         ret = fwrite(&result, sizeof(result), 1, cal_file);
@@ -306,6 +305,7 @@
               __func__);
     }
 
+write_dsp:
     header.size = sizeof(header);
     header.module_id = CRUS_MODULE_ID_TX;
     header.param_id = 0;