commit 897f4bea427e0b55a056c58b49ca7641697acc8b
author android-build-team Robot <android-build-team-robot@google.com> Tue May 08 19:36:14 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 08 19:36:14 2018 -0700
tree 3401cc801d3ebf05ba0d303cb9bc1b5e0eb007f8
parent 4a4b2c230d7d21d880e7b8cea1562191df51f889
parent 8221fc17ff5ab4bf103e1e7dc44bb46b7d872d9c

Merge "audio: cirrus: Don't enable to write calibration files" into pi-dev
am: 8221fc17ff

Change-Id: Ibcba966133ad96e456f665aff081628db5091f28

hal/audio_extn/cirrus_playback.c

diff --git a/hal/audio_extn/cirrus_playback.c b/hal/audio_extn/cirrus_playback.c
index 1fd8984..21dbc10 100644
--- a/hal/audio_extn/cirrus_playback.c
+++ b/hal/audio_extn/cirrus_playback.c
@@ -282,11 +282,13 @@
         if (ret < 0)
             goto exit;
 
+#ifdef ENABLED_CIRRUS_WRITE_CAL_FILE
         cal_file = fopen(CRUS_CAL_FILE, "wb");
         if (cal_file == NULL) {
-            ALOGE("%s: Cannot create Cirrus SP calibration file (%s), write cal value to dsp",
+            ALOGE("%s: Cannot create Cirrus SP calibration file (%s)",
                   __func__, strerror(errno));
-            goto write_dsp;
+            ret = -EINVAL;
+            goto exit;
         }
 
         ret = fwrite(&result, sizeof(result), 1, cal_file);
@@ -303,9 +305,9 @@
 
         ALOGI("%s: Cirrus calibration file successfully written",
               __func__);
+#endif
     }
 
-write_dsp:
     header.size = sizeof(header);
     header.module_id = CRUS_MODULE_ID_TX;
     header.param_id = 0;