commit c399c8f222fc5d4068a4f5e0215cdc000ebc7526
author Manish Kumar <manishku@codeaurora.org> Mon Sep 21 15:31:18 2015 +0530
committer Manish Kumar <manishku@codeaurora.org> Tue Sep 22 11:44:54 2015 +0530
tree a6d9c74cea545d1f74d98284d2122e57f3116f62
parent 95333359b939d4e4b4a546d6f38e2f82258f8b31
parent 50650f44fd1c18620bc39a4458f38974eef61402

Merge commit '50650f44fd1c18620bc39a4458f38974eef61402' into private_redfox64_mbr.

Conflicts:
	hal/msm8974/platform.c

Change-Id: Ie0bb8b8a122ead1e46476bb4eb7ec5e3e34108e0

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 6592c35..b7ffde3 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1299,6 +1299,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 2a3ddba..2b9608c 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -998,6 +998,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);