commit ff8c85ceb728cda268b1fdaaff4362dde1247897
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 14 14:57:56 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 14 14:57:56 2014 -0700
tree 97e7d219c4132dce0fbd36978d56c79ae2aac0bf
parent 8a0d03c974c3f2752d865069ca8ef12d7ceb0f0a
parent 3cde892280b89cd2a1fd1784c33fa9254da41ab9

Merge "hal: check the pointer before dereference"

hal/audio_extn/spkr_protection.c

diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index 59b46fc..a350198 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -753,7 +753,8 @@
         (const pthread_attr_t *) NULL, spkr_calibration_thread, &handle);
     } else {
         ALOGE("%s: thermal_client_request failed", __func__);
-        if (handle.thermal_client_handle)
+        if (handle.thermal_client_handle &&
+            handle.thermal_client_unregister_callback)
             handle.thermal_client_unregister_callback(handle.thermal_client_handle);
         if (handle.thermal_handle)
             dlclose(handle.thermal_handle);