{"id":22600,"url":"https://patchwork.libcamera.org/api/patches/22600/?format=json","web_url":"https://patchwork.libcamera.org/patch/22600/","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":"<20250121130037.237947-1-dan.scally@ideasonboard.com>","date":"2025-01-21T13:00:37","name":"libcamera: mali-c55: Fix error paths in ::init()","commit_ref":"e342f050c283283eec1191c94a692325362c170e","pull_url":null,"state":"accepted","archived":false,"hash":"3094423602db7222db43a90f75a6ad383396d527","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/people/156/?format=json","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22600/mbox/","series":[{"id":4959,"url":"https://patchwork.libcamera.org/api/series/4959/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4959","date":"2025-01-21T13:00:37","name":"libcamera: mali-c55: Fix error paths in ::init()","version":1,"mbox":"https://patchwork.libcamera.org/series/4959/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22600/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22600/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E022ABD16B\n\tfor ;\n\tTue, 21 Jan 2025 13:00:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C0D916851D;\n\tTue, 21 Jan 2025 14:00:53 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7058960380\n\tfor ;\n\tTue, 21 Jan 2025 14:00:52 +0100 (CET)","from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 283FC788;\n\tTue, 21 Jan 2025 13:59:50 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"DmO/LkO1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1737464390;\n\tbh=BLQlZu6wfBSKhrDIngkxUU6kZee6rpgjS4VTTCDAhho=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=DmO/LkO13LzHKW1vTiCU8GXpGTR+oRe4/Vm1kvhaSVdAvcDQwbpZxsaOw2W2Xbrw5\n\t4c9+Gft5iNPVVzO352yUn84DydUT+I7rj42OsqHU0/YsHbEujJiemGkuVSfUqO8YdV\n\tbADBPf7SHlrI67U7P15Bv44Rr0kt34PIaBX8ITwg=","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Cc":"Daniel Scally ","Subject":"[PATCH] libcamera: mali-c55: Fix error paths in ::init()","Date":"Tue, 21 Jan 2025 13:00:37 +0000","Message-Id":"<20250121130037.237947-1-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In the ::init() function there are two places that return values they\nshouldn't; the ret variable is returned after checking a pointer is\nnot null instead of an explicit -ENODEV and later the boolean value\nfalse is returned on failure instead of the error value returned by\nV4L2Subdevice::open() - fix both problems.\n\nSigned-off-by: Daniel Scally \n---\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 7 ++++---\n 1 file changed, 4 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 5abd6b20..6aa2f2d9 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -159,15 +159,16 @@ int MaliC55CameraData::init()\n \t */\n \tsensor_ = CameraSensorFactoryBase::create(entity_);\n \tif (!sensor_)\n-\t\treturn ret;\n+\t\treturn -ENODEV;\n \n \tconst MediaPad *sourcePad = entity_->getPadByIndex(0);\n \tMediaEntity *csiEntity = sourcePad->links()[0]->sink()->entity();\n \n \tcsi_ = std::make_unique(csiEntity);\n-\tif (csi_->open()) {\n+\tret = csi_->open();\n+\tif (ret) {\n \t\tLOG(MaliC55, Error) << \"Failed to open CSI-2 subdevice\";\n-\t\treturn false;\n+\t\treturn ret;\n \t}\n \n \treturn 0;\n","prefixes":[]}