{"id":3099,"url":"https://patchwork.libcamera.org/api/patches/3099/?format=json","web_url":"https://patchwork.libcamera.org/patch/3099/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200314235728.15495-7-laurent.pinchart@ideasonboard.com>","date":"2020-03-14T23:57:25","name":"[libcamera-devel,6/9] libcamera: camera: Propagate error value from importFrameBuffer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"aa35c813e6c4a79629b947ef4a5a4008cc0ba363","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3099/mbox/","series":[{"id":719,"url":"https://patchwork.libcamera.org/api/series/719/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=719","date":"2020-03-14T23:57:19","name":"Simplify buffer management with V4L2 buffer orphaning","version":1,"mbox":"https://patchwork.libcamera.org/series/719/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3099/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3099/checks/","tags":{},"headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 59C1062944\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 15 Mar 2020 00:57:42 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EB8DE10CA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 15 Mar 2020 00:57:41 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584230262;\n\tbh=20TSaj08OwTg/qymb9XsHYDz17qD53Z5bgEU6Xr9v5w=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=ZT/8qzbHcWAd6h0YvN1y4xAch0N7Lpc7E6LnxPi/HnHV3me+OVTQh9kXbR/0hyLEW\n\tGSSkBtIf2tXtkF93kBwYvP5TIdQRW20D04v2L5ZtU0KD5zISyqE4XjOxTAYpMH20Fk\n\tQcHXsb6URpTEKxzHK3Ww6eC7pGTy2l31YorgY7lg=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 6/9] libcamera: camera: Propagate error\n\tvalue from importFrameBuffer","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Sat, 14 Mar 2020 23:57:42 -0000"},"content":"The PipelineHandler::importFrameBuffer() function, called by\nCamera::start() may return an error, but its return value is ignored.\nPropagate it to the caller to fix this.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/camera.cpp | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 63b1f7729937..9c432adb1d97 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -931,8 +931,10 @@ int Camera::start()\n \t\tif (allocator_ && !allocator_->buffers(stream).empty())\n \t\t\tcontinue;\n \n-\t\tp_->pipe_->invokeMethod(&PipelineHandler::importFrameBuffers,\n-\t\t\t\t\tConnectionTypeDirect, this, stream);\n+\t\tret = p_->pipe_->invokeMethod(&PipelineHandler::importFrameBuffers,\n+\t\t\t\t\t      ConnectionTypeDirect, this, stream);\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n \t}\n \n \tret = p_->pipe_->invokeMethod(&PipelineHandler::start,\n","prefixes":["libcamera-devel","6/9"]}