commit afc983edd3cbc71c16377128f9e6b162728db5fe
author android-build-team Robot <android-build-team-robot@google.com> Fri May 04 19:34:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 04 19:34:09 2018 -0700
tree 10d18b707c237155db4d33d5dda9f749e58ec0c5
parent 23ced428c9247b406615726fa104501500137528
parent 2cd5a9c947ca72d4c3c3b5d0885766d9b0adcdae

Merge "audio: Handle missing / tainted calibration file" into pi-dev am: 7780106b56
am: 2cd5a9c947

Change-Id: I7ab82dd8799c838f1bcc0eed9a86bb95b7e9680c

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;