PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: v4l2_videodevice: Fix ordering of debug statement

Browse Source 
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: 04d5be7f76 ("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>
This commit is contained in:
Kieran Bingham
2019-08-08 12:06:10 +01:00
parent e0f35d6f57
commit 3a278eb460
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcamera/v4l2_videodevice.cpp
View File

@@ -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;
}