From c7bcae02a0865c650dcb54027aec6c34db0c78bf Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 13 Oct 2020 15:58:26 +0100 Subject: android: camera_device: Use existing variable definitions Prevent variable shadowing by removing the redeclaration of variables with the same name (and type) where the existing variable can be reused. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index e9404c2f..5272b9ec 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1316,7 +1316,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) * the Android camera3_stream_t. */ for (CameraStream &cameraStream : streams_) { - int ret = cameraStream.configure(); + ret = cameraStream.configure(); if (ret) { LOG(HAL, Error) << "Failed to configure camera stream"; return ret; -- cgit v1.2.1