]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: vim2m: Fix abort issue
authorJernej Skrabec <jernej.skrabec@siol.net>
Thu, 12 Sep 2019 18:55:55 +0000 (15:55 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:43:19 +0000 (16:43 +0100)
[ Upstream commit c362f77a243bfd1daec21b6c36491c061ee2f31b ]

Currently, if start streaming -> stop streaming -> start streaming
sequence is executed, driver will end job prematurely, if ctx->translen
is higher than 1, because "aborting" flag is still set from previous
stop streaming command.

Fix that by clearing "aborting" flag in start streaming handler.

Fixes: 96d8eab5d0a1 ("V4L/DVB: [v5,2/2] v4l: Add a mem-to-mem videobuf framework test device")
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/vim2m.c

index acd3bd48c7e216eaad1dc7343fe3df9bdaac0caf..2d79cdc130c5892ec6fe60655a9c39c71a60af1b 100644 (file)
@@ -1073,6 +1073,9 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned int count)
        if (!q_data)
                return -EINVAL;
 
+       if (V4L2_TYPE_IS_OUTPUT(q->type))
+               ctx->aborting = 0;
+
        q_data->sequence = 0;
        return 0;
 }