From patchwork Sat Mar 14 23:57:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3099 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 59C1062944 for ; Sun, 15 Mar 2020 00:57:42 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EB8DE10CA for ; Sun, 15 Mar 2020 00:57:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584230262; bh=20TSaj08OwTg/qymb9XsHYDz17qD53Z5bgEU6Xr9v5w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZT/8qzbHcWAd6h0YvN1y4xAch0N7Lpc7E6LnxPi/HnHV3me+OVTQh9kXbR/0hyLEW GSSkBtIf2tXtkF93kBwYvP5TIdQRW20D04v2L5ZtU0KD5zISyqE4XjOxTAYpMH20Fk QcHXsb6URpTEKxzHK3Ww6eC7pGTy2l31YorgY7lg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 15 Mar 2020 01:57:25 +0200 Message-Id: <20200314235728.15495-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200314235728.15495-1-laurent.pinchart@ideasonboard.com> References: <20200314235728.15495-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 6/9] libcamera: camera: Propagate error value from importFrameBuffer X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 23:57:42 -0000 The PipelineHandler::importFrameBuffer() function, called by Camera::start() may return an error, but its return value is ignored. Propagate it to the caller to fix this. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/camera.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 63b1f7729937..9c432adb1d97 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -931,8 +931,10 @@ int Camera::start() if (allocator_ && !allocator_->buffers(stream).empty()) continue; - p_->pipe_->invokeMethod(&PipelineHandler::importFrameBuffers, - ConnectionTypeDirect, this, stream); + ret = p_->pipe_->invokeMethod(&PipelineHandler::importFrameBuffers, + ConnectionTypeDirect, this, stream); + if (ret < 0) + return ret; } ret = p_->pipe_->invokeMethod(&PipelineHandler::start,