Disable auto connect while calling bt_gatt_connect

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / bt_le_adapter / tizen / caleclient.c

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
index c13d8e2..dac20be 100755 (executable)
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
@@ -1170,11 +1170,8 @@ CAResult_t CALEGattConnect(const char *remoteAddress)
     oc_mutex_lock(g_LEClientConnectMutex);
     CAResult_t result = CA_STATUS_OK;
 
-#ifdef TIZEN_VD
-    int ret = bt_gatt_connect(remoteAddress, true);
-#else
     int ret = bt_gatt_connect(remoteAddress, false);
-#endif
+
     if (BT_ERROR_NONE != ret)
     {
         OIC_LOG_V(ERROR, TAG, "bt_gatt_connect Failed with ret value [%s] ",
@@ -1320,7 +1317,8 @@ static CAResult_t CALEGattConnectionRetry(const char *remoteAddress)
 {
     OIC_LOG(DEBUG, TAG, "IN");
 
-    VERIFY_NON_NULL_VOID(remoteAddress, TAG, "remote address is NULL")
+    VERIFY_NON_NULL_RET(remoteAddress, TAG,
+                        "remote address is NULL", CA_STATUS_FAILED);
 
     CALEGattDisConnect(remoteAddress);
     CALEWaittillDisconnect(g_isDisconnectedMutex, g_LEDisconnectedCond, 10);
@@ -1808,4 +1806,4 @@ CAResult_t CALEClientSendNegotiationMessage(const char* address)
     //@Todo
     //it will be implemented when tizen public 3.0 is released.
     return CA_NOT_SUPPORTED;
-}
\ No newline at end of file
+}