From patchwork Sat May 18 20:44:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1230 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1F54160BFD for ; Sat, 18 May 2019 22:44:47 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 821ADD5 for ; Sat, 18 May 2019 22:44:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1558212286; bh=OV2eFvO3uJNTlvvBoDLXTL0evwNUv/EZAo3YrOeyysY=; h=From:To:Subject:Date:From; b=eAQLRJ+H+mu61o3xhEWerzOSevdgvVZaHh4fnwWcS1FPC2N1rvtDUtT4ZHEgdboQh D1amg+dapp1Xf3TXqtUy4p42VRo5MX2geQSE/8IU+ZCGSakBBAvuCb1B6zxlz4Ogyq Jq3w6JFwoe1/y+cPrSHZL+KxYReV4tWVbfPsTNe8= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 18 May 2019 23:44:26 +0300 Message-Id: <20190518204426.15119-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: pipeline: rkisp1: Fix usage of uninitialised variable X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2019 20:44:47 -0000 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 Reviewed-by: Niklas Söderlund --- 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 b395405c9ddb..96553bf2d9ef 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.