From b7f2b4bc247ddaf1cd64c2b84cb70dee981eb7bd Mon Sep 17 00:00:00 2001 From: Allenhui89 Date: Mon, 14 Sep 2020 10:27:31 +0800 Subject: [PATCH] =?UTF-8?q?!2=20=E4=BF=AE=E6=94=B9=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD=E7=AD=96=E7=95=A5=20Merge?= =?UTF-8?q?=20pull=20request=20!2=20from=20Allenhui89/master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/manager/src/devhost_service_clnt.c | 1 - core/manager/src/devmgr_service.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/manager/src/devhost_service_clnt.c b/core/manager/src/devhost_service_clnt.c index 03c5136d..5d9d5262 100755 --- a/core/manager/src/devhost_service_clnt.c +++ b/core/manager/src/devhost_service_clnt.c @@ -62,7 +62,6 @@ int DevHostServiceClntInstallDriver(struct DevHostServiceClnt *hostClnt) } ret = devHostSvcIf->AddDevice(devHostSvcIf, deviceInfo); if (ret != HDF_SUCCESS) { - deviceInfo->preload = DEVICE_PRELOAD_DISABLE; HDF_LOGE("Install %s driver failed, ret = %d", deviceInfo->svcName, ret); } } diff --git a/core/manager/src/devmgr_service.c b/core/manager/src/devmgr_service.c index 2d0001aa..d6d5d0c0 100755 --- a/core/manager/src/devmgr_service.c +++ b/core/manager/src/devmgr_service.c @@ -77,7 +77,7 @@ static int DevmgrServiceFindAndActiveDevice(const char *svcName, bool isLoad) HdfSListIteratorInit(&itDeviceInfo, hostClnt->deviceInfos); while (HdfSListIteratorHasNext(&itDeviceInfo)) { deviceInfo = (struct HdfDeviceInfo *)HdfSListIteratorNext(&itDeviceInfo); - if (strcmp(deviceInfo->svcName, svcName) == 0) { + if ((strcmp(deviceInfo->svcName, svcName) == 0) && (deviceInfo->preload == DEVICE_PRELOAD_DISABLE)) { return DevmgrServiceActiveDevice(hostClnt, deviceInfo, isLoad); } }