summaryrefslogtreecommitdiff
path: root/camera/device/1.0/default/CameraDevice.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'camera/device/1.0/default/CameraDevice.cpp')
-rw-r--r--camera/device/1.0/default/CameraDevice.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp
index a03bbc8670..2dd6094a53 100644
--- a/camera/device/1.0/default/CameraDevice.cpp
+++ b/camera/device/1.0/default/CameraDevice.cpp
@@ -397,9 +397,11 @@ void CameraDevice::sPutMemory(camera_memory_t *data) {
CameraDevice* device = mem->handle.mDevice;
if (device == nullptr) {
ALOGE("%s: camera HAL return memory for a null device!", __FUNCTION__);
+ return;
}
if (device->mDeviceCallback == nullptr) {
ALOGE("%s: camera HAL return memory while camera is not opened!", __FUNCTION__);
+ return;
}
device->mDeviceCallback->unregisterMemory(mem->handle.mId);
{