From 9b5478e7259a403f847083ec4af239fa70428768 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Fri, 16 Apr 2021 17:03:20 +0100 Subject: libcamera: pipeline: ipu3: Check for failures when loading IPA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ipa_->init() method can fail if the IPA can't load correctly. This should be caught by the pipeline handler to prevent continuing with an invalid IPA. Signed-off-by: Kieran Bingham Reviewed-by: Jean-Michel Hautbois Reviewed-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/ipu3/ipu3.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 519cad4f..51446fcf 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -1145,7 +1145,11 @@ int IPU3CameraData::loadIPA() ipa_->queueFrameAction.connect(this, &IPU3CameraData::queueFrameAction); CameraSensor *sensor = cio2_.sensor(); - ipa_->init(IPASettings{ "", sensor->model() }); + int ret = ipa_->init(IPASettings{ "", sensor->model() }); + if (ret) { + LOG(IPU3, Error) << "Failed to initialise the IPU3 IPA"; + return ret; + } return 0; } -- cgit v1.2.1