Merge remote-tracking branch 'remotes/origin/caf/github/master' into ant.lnx.2.9.1

Change-Id: I5ad1c4f69b1bab668b80fb2fdc59b2cff4bd9dd1
diff --git a/src/qcomm-hidl/AntHidlClient.cpp b/src/qcomm-hidl/AntHidlClient.cpp
index d41a319..fce47c4 100644
--- a/src/qcomm-hidl/AntHidlClient.cpp
+++ b/src/qcomm-hidl/AntHidlClient.cpp
@@ -203,11 +203,11 @@
       {
          ALOGE("%s: HIDL daemon is dead", __func__);
       }
+      std::unique_lock< std::mutex> lock(ant_hci.data_mtx);
+      ant_hci.data_cond.notify_all();
    }
    ant_hci.state = ANT_RADIO_DISABLED;
    ant_rx_clear();
-   std::unique_lock< std::mutex> lock(ant_hci.data_mtx);
-   ant_hci.data_cond.notify_all();
    anthci =nullptr;
    ALOGI("%s: exit", __func__);
 }