From 06387039d6f59f8cb1829edfc09d2d9c8b33d62c Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sat, 18 May 2019 23:43:04 +0300
Subject: libcamera: pipeline: rkisp1: Fix usage of uninitialised variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit 1a813a5c3ab7 introduced usage of an uninitialised variable. Fix it.
Fixes: 1a813a5c3ab7 ("libcamera: media_device: Handle media device fd in acquire() and release()")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index b395405c..96553bf2 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -159,12 +159,9 @@ int PipelineHandlerRkISP1::configureStreams(Camera *camera,
ret = link->setEnabled(enable);
if (ret < 0)
- break;
+ return ret;
}
- if (ret < 0)
- return ret;
-
/*
* Configure the format on the sensor output and propagate it through
* the pipeline.
--
cgit v1.2.1