commit 82b16a4f3933e3c4eb10d47d6a98be3ce6660f4e
author Chaithanya Krishna Bacharaju <chaithan@codeaurora.org> Mon Aug 31 17:41:46 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Sep 12 00:13:26 2015 -0700
tree 5bcf9752d28e281ff97cc993725ed7591d1da291
parent 90ff1782dbc2bc05498aa61ddeb0f578192e868c

hal: fix querying MAD calibration

Processing of HWDEP MAD calibration is done from sound trigger
HAL. Skip it in audio HAL which results in unnecessary logging
of errors although ignored.

Change-Id: Ibd8e6bea78d5e686c25ea5a5bb77b1cc5e53604e

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index c632a82..f5af3a0 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1283,6 +1283,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 142a85d..c8e44a2 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -981,6 +981,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);