[libcamera-devel,v3,2/6] libcamera: v4l2_videodevice: Fix ordering of debug statement
diff mbox series

Message ID 20190813094020.10277-3-kieran.bingham@ideasonboard.com
State Accepted
Headers show
Series
  • V4L2 M2M Support (+RPi PoC)
Related show

Commit Message

Kieran Bingham Aug. 13, 2019, 9:40 a.m. UTC 
The "Opened device" statement occurs before the buffertype_ is set.

This causes all devices to report that they are [out] devices at open()
regardless of their type.

As the message operates in the past-tense, move the statement to the end
of the function when all work has been completed.

Fixes: 04d5be7f76fe ("libcamera: v4l2_device: Inherit from Loggable to print device node name")
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/v4l2_videodevice.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp
index c43d7cc557a0..81098dd70190 100644
--- a/src/libcamera/v4l2_videodevice.cpp
+++ b/src/libcamera/v4l2_videodevice.cpp
@@ -314,10 +314,6 @@  int V4L2VideoDevice::open()
 		return ret;
 	}
 
-	LOG(V4L2, Debug)
-		<< "Opened device " << caps_.bus_info() << ": "
-		<< caps_.driver() << ": " << caps_.card();
-
 	if (!caps_.hasStreaming()) {
 		LOG(V4L2, Error) << "Device does not support streaming I/O";
 		return -EINVAL;
@@ -352,6 +348,10 @@  int V4L2VideoDevice::open()
 	fdEvent_->activated.connect(this, &V4L2VideoDevice::bufferAvailable);
 	fdEvent_->setEnabled(false);
 
+	LOG(V4L2, Debug)
+		<< "Opened device " << caps_.bus_info() << ": "
+		<< caps_.driver() << ": " << caps_.card();
+
 	return 0;
 }