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;