From 58f62fb09238fe2e61b84d13cce0cdc267d6da8e Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Sun, 14 Sep 2014 19:24:16 +0000 Subject: [PATCH] Revert "Manta: libcamera2: prevent HAL crash when ZSL stream freed" This reverts commit 492f70a554a92abd6c4b3159ca151f162b467b8b. Bug: 17489789 Change-Id: Iffec3971acc6cbb4a760c2163d634f9d5c61ca3d --- libcamera2/ExynosCameraHWInterface2.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp index ffa2199..a722a90 100644 --- a/libcamera2/ExynosCameraHWInterface2.cpp +++ b/libcamera2/ExynosCameraHWInterface2.cpp @@ -1944,7 +1944,6 @@ int ExynosCameraHWInterface2::allocateStream(uint32_t width, uint32_t height, in subParameters->height = height; subParameters->format = *format_actual; subParameters->svcPlanes = 1; - parentStream->m_parameters.streamOps = subParameters->streamOps = stream_ops; subParameters->usage = *usage; subParameters->numOwnSvcBuffers = *max_buffers; @@ -1983,7 +1982,6 @@ int ExynosCameraHWInterface2::allocateStream(uint32_t width, uint32_t height, in subParameters->height = height; subParameters->format = *format_actual; subParameters->svcPlanes = NUM_PLANES(*format_actual); - parentStream->m_parameters.streamOps = subParameters->streamOps = stream_ops; subParameters->usage = *usage; subParameters->numOwnSvcBuffers = *max_buffers; -- 2.20.1