commit 76f43b7c9cb521094752a50ca8d43490126a2bae
author Linux Build Service Account <lnxbuild@localhost> Sat Sep 05 08:09:59 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Sep 05 08:09:59 2015 -0700
tree d1f64f970d79846ec662a298006a33c0878e6fdf
parent 2385fcb6f55e367ab7bd7520530e212cf338063f
parent 63a47ef3628ef382fda5ef4352bf5bb9e32da5a1

Merge "hal: fix querying MAD calibration"

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index aca7e58..72a76b6 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1139,6 +1139,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);

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 1a359b5..d4533f5 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1054,6 +1054,10 @@
         struct param_data calib;
         int ret;
 
+        /* MAD calibration is handled by sound trigger HAL, skip here */
+        if (type == WCD9XXX_MAD_CAL)
+            continue;
+
         ret = 0;
         calib.get_size = 1;
         ret = acdb_loader_get_calibration(cal_name_info[type],