commit 6ed638753e8431cc06b2cf3adbd35826a2414885
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 24 05:13:39 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 24 05:13:39 2015 -0700
tree 3f3b14e7050015333b8c5f9887363af699d5284a
parent 7437ad428419bea868a16658656a52fdc5fe9747
parent c399c8f222fc5d4068a4f5e0215cdc000ebc7526

Merge "Merge commit '50650f44fd1c18620bc39a4458f38974eef61402' into private_redfox64_mbr."

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 934850f..c0aa2a1 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1301,6 +1301,10 @@
                ALOGE("%s error in sending vbat adc data to acdb", __func__);
 	}
 
+        /* MAD calibration is handled by sound trigger HAL, skip here */
+        if (type == WCD9XXX_MAD_CAL)
+            continue;
+
         calib.get_size = 1;
         ret = acdb_loader_get_calibration(cal_name_info[type], sizeof(struct param_data),
                                                                  &calib);

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 5a89f16..65dd01f 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1002,6 +1002,10 @@
         struct wcdcal_ioctl_buffer codec_buffer;
         struct param_data calib;
 
+        /* MAD calibration is handled by sound trigger HAL, skip here */
+        if (type == WCD9XXX_MAD_CAL)
+            continue;
+
         calib.get_size = 1;
         ret = acdb_loader_get_calibration(cal_name_info[type], sizeof(struct param_data),
                                                                  &calib);