diff --git a/core/host/src/devhost_service.c b/core/host/src/devhost_service.c
index 15ebde7a0a45e948b9764d889bec4dca97c04ac4..48814c6f6690d549c5c5bd69efc8e9922f2eb774 100644
--- a/core/host/src/devhost_service.c
+++ b/core/host/src/devhost_service.c
@@ -17,15 +17,15 @@
 
 #define HDF_LOG_TAG devhost_service
 
-static struct HdfDevice *DevHostServiceFindDevice(struct DevHostService *inst, uint16_t deviceId)
+static struct HdfDevice *DevHostServiceFindDevice(struct DevHostService *hostService, uint16_t deviceId)
 {
     struct HdfDevice *deviceNode = NULL;
-    if (inst == NULL) {
-        HDF_LOGE("failed to find driver, inst is null");
+    if (hostService == NULL) {
+        HDF_LOGE("failed to find driver, hostService is null");
         return NULL;
     }
 
-    DLIST_FOR_EACH_ENTRY(deviceNode, &inst->devices, struct HdfDevice, node) {
+    DLIST_FOR_EACH_ENTRY(deviceNode, &hostService->devices, struct HdfDevice, node) {
         if (deviceNode->deviceId == deviceId) {
             return deviceNode;
         }
@@ -33,12 +33,12 @@ static struct HdfDevice *DevHostServiceFindDevice(struct DevHostService *inst, u
     return NULL;
 }
 
-static void DevHostServiceFreeDevice(struct DevHostService *inst, uint16_t deviceId)
+static void DevHostServiceFreeDevice(struct DevHostService *hostService, uint16_t deviceId)
 {
-    struct HdfDevice *deviceNode = DevHostServiceFindDevice(inst, deviceId);
-    if (deviceNode != NULL) {
-        DListRemove(&deviceNode->node);
-        HdfDeviceFreeInstance(deviceNode);
+    struct HdfDevice *device = DevHostServiceFindDevice(hostService, deviceId);
+    if (device != NULL) {
+        DListRemove(&device->node);
+        HdfDeviceFreeInstance(device);
     }
 }
 
@@ -90,9 +90,7 @@ int DevHostServiceAddDevice(struct IDevHostService *inst, const struct HdfDevice
     return HDF_SUCCESS;
 
 error:
-    if (DListIsEmpty(&hostService->devices)) {
-        DevHostServiceFreeDevice(hostService, hostService->hostId);
-    }
+    DevHostServiceFreeDevice(hostService, device->deviceId);
     return ret;
 }
 
diff --git a/core/host/src/hdf_device.c b/core/host/src/hdf_device.c
index 3fc557001957da4194cd749f200a7101bda60fa3..af7a6e8103afe7aa80f235ee4bac3b90bad797e6 100644
--- a/core/host/src/hdf_device.c
+++ b/core/host/src/hdf_device.c
@@ -68,7 +68,7 @@ struct HdfDevice *HdfDeviceNewInstance()
 void HdfDeviceFreeInstance(struct HdfDevice *device)
 {
     if (device != NULL) {
-        HdfObjectManagerFreeObject((struct HdfObject *)device);
+        HdfObjectManagerFreeObject(&device->super.object);
     }
 }
 
diff --git a/core/host/src/hdf_device_node.c b/core/host/src/hdf_device_node.c
index 793da0d6a3440ee0e9bc0d177a864da953986594..c76398b262ad9848e6d0ac87edcc8ab37464b93f 100644
--- a/core/host/src/hdf_device_node.c
+++ b/core/host/src/hdf_device_node.c
@@ -86,24 +86,15 @@ int HdfDeviceLaunchNode(struct HdfDeviceNode *devNode, struct IHdfDevice *devIns
     }
     int ret = driverEntry->Init(&devNode->deviceObject);
     if (ret != HDF_SUCCESS) {
-        if (driverEntry->Release != NULL) {
-            driverEntry->Release(&devNode->deviceObject);
-        }
         return HDF_DEV_ERR_DEV_INIT_FAIL;
     }
     ret = HdfDeviceNodePublishService(devNode, deviceInfo, devInst);
     if (ret != HDF_SUCCESS) {
-        if (driverEntry->Release != NULL) {
-            driverEntry->Release(&devNode->deviceObject);
-        }
         return HDF_DEV_ERR_PUBLISH_FAIL;
     }
     deviceToken = devNode->token;
     ret = DevmgrServiceClntAttachDevice(deviceInfo, deviceToken);
     if (ret != HDF_SUCCESS) {
-        if (driverEntry->Release != NULL) {
-            driverEntry->Release(&devNode->deviceObject);
-        }
         return HDF_DEV_ERR_ATTACHDEV_FAIL;
     }
     return ret;
@@ -186,6 +177,9 @@ void HdfDeviceNodeDelete(struct HdfSListNode *deviceEntry)
     }
     struct HdfDeviceNode *devNode =
         HDF_SLIST_CONTAINER_OF(struct HdfSListNode, deviceEntry, struct HdfDeviceNode, entry);
+    if (devNode->driverEntry->Release != NULL) {
+        devNode->driverEntry->Release(&devNode->deviceObject);
+    }
     HdfDeviceNodeFreeInstance(devNode);
 }