From 823fc8e25b41a42769421f27f39fab454e1339fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
Date: Wed, 6 Mar 2019 00:48:46 +0100
Subject: libcamera: camera: Fix access bug in configureStreams()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is not permitted to configure streams before a camera is acquired.

Fixes: 77100a7578d8a0cc ("libcamera: camera: add state machine to control access from applications")
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/camera.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp
index e3144c5b..8ee9cc08 100644
--- a/src/libcamera/camera.cpp
+++ b/src/libcamera/camera.cpp
@@ -405,7 +405,7 @@ int Camera::configureStreams(std::map<Stream *, StreamConfiguration> &config)
 	if (disconnected_)
 		return -ENODEV;
 
-	if (!stateBetween(CameraAvailable, CameraConfigured))
+	if (!stateBetween(CameraAcquired, CameraConfigured))
 		return -EACCES;
 
 	if (!config.size()) {
-- 
cgit v1.2.1