From 780edc96942e1b492e40c5062412b82a174fe66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=99=BE=E5=B7=9D?= Date: Thu, 13 Apr 2023 11:51:18 +0000 Subject: [PATCH 1/2] fix: fixed the fault if camDev==NULL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 郑百川 --- framework/model/camera/core/src/camera_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/model/camera/core/src/camera_core.c b/framework/model/camera/core/src/camera_core.c index 85cfa53ee..2d3adceeb 100644 --- a/framework/model/camera/core/src/camera_core.c +++ b/framework/model/camera/core/src/camera_core.c @@ -97,10 +97,10 @@ static int32_t HdfCameraInitInterfaces(const char *deviceName, struct CameraDevi if (camDev == NULL) { HDF_LOGE("%s: allocate camera device failed!", __func__); ret = HDF_FAILURE; + }else { + camDev->deviceDriver = deviceDriver; } - camDev->deviceDriver = deviceDriver; - ret = deviceDriver->init(deviceDriver, camDev); if (ret != HDF_SUCCESS) { HDF_LOGE("%s: init device %{public}s failed! ret=%{public}d", __func__, factory->deviceName, ret); -- Gitee From 4e9445aada5c12b2497c526716f53e1a41acceba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=99=BE=E5=B7=9D?= Date: Thu, 13 Apr 2023 12:15:52 +0000 Subject: [PATCH 2/2] feature: added a space MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 郑百川 --- framework/model/camera/core/src/camera_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/model/camera/core/src/camera_core.c b/framework/model/camera/core/src/camera_core.c index 2d3adceeb..f0e308c3c 100644 --- a/framework/model/camera/core/src/camera_core.c +++ b/framework/model/camera/core/src/camera_core.c @@ -97,7 +97,7 @@ static int32_t HdfCameraInitInterfaces(const char *deviceName, struct CameraDevi if (camDev == NULL) { HDF_LOGE("%s: allocate camera device failed!", __func__); ret = HDF_FAILURE; - }else { + } else { camDev->deviceDriver = deviceDriver; } -- Gitee