From: Mark Salyzyn <salyzyn@google.com>
Date: Sun, 14 Sep 2014 19:24:16 +0000 (+0000)
Subject: Revert "Manta: libcamera2: prevent HAL crash when ZSL stream freed"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=58f62fb09238fe2e61b84d13cce0cdc267d6da8e;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung_slsi_exynos5.git

Revert "Manta: libcamera2: prevent HAL crash when ZSL stream freed"

This reverts commit 492f70a554a92abd6c4b3159ca151f162b467b8b.

Bug: 17489789
Change-Id: Iffec3971acc6cbb4a760c2163d634f9d5c61ca3d
---

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;