From 29c3b54f0c8ec7e3aeed8971d24f939bc4bfab04 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Mon, 21 Jan 2019 11:17:44 +0000 Subject: libcamera: camera_manager: Return EBUSY if enumerator exists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the case that someone calls CameraManager::start() and it has already started/enumerated, instead of returning -ENODEV, return -EBUSY. Reviewed-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/libcamera/camera_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcamera/camera_manager.cpp') diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 372b5a59..37ccbd53 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -78,7 +78,7 @@ CameraManager::~CameraManager() int CameraManager::start() { if (enumerator_) - return -ENODEV; + return -EBUSY; enumerator_ = DeviceEnumerator::create(); if (enumerator_->enumerate()) -- cgit v1.2.1