[libcamera-devel] [PATCH 2/6] libcamera: v4l2_videodevice: Fix ordering of debug statement
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Thu Aug 8 22:26:59 CEST 2019
Hi Kieran,
Thank you for the patch.
On Thu, Aug 08, 2019 at 04:12:17PM +0100, Kieran Bingham wrote:
> 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")
No need to wrap this line :-)
> Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
> src/libcamera/v4l2_videodevice.cpp | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> 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;
> }
>
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list