From 5db033f0e7d4fd1b27422a74f6b3442affe13adc Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 16 Jun 2021 15:33:08 +0100 Subject: libcamera: pipeline: vimc: Fail without an IPA The IPA is required for VIMC so fail early if it can't be loaded. Reviewed-by: Umang Jain Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/libcamera/pipeline/vimc/vimc.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index d89ab33a..8bbac008 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -426,13 +426,14 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) return false; data->ipa_ = IPAManager::createIPA(this, 0, 0); - if (data->ipa_ != nullptr) { - std::string conf = data->ipa_->configurationFile("vimc.conf"); - data->ipa_->init(IPASettings{ conf, data->sensor_->model() }); - } else { - LOG(VIMC, Warning) << "no matching IPA found"; + if (!data->ipa_) { + LOG(VIMC, Error) << "no matching IPA found"; + return false; } + std::string conf = data->ipa_->configurationFile("vimc.conf"); + data->ipa_->init(IPASettings{ conf, data->sensor_->model() }); + /* Create and register the camera. */ std::set streams{ &data->stream_ }; std::shared_ptr camera = -- cgit v1.2.1