Skip to content

Commit

Permalink
[media] vb2-core: call threadio->fnc() if !VB2_BUF_STATE_ERROR
Browse files Browse the repository at this point in the history
changeset 70433a1 ("media: videobuf2: Refactor vb2_fileio_data
and vb2_thread") broke videobuf2-dvb.

The root cause is that, instead of calling threadio->fnc() for
all types of events except for VB2_BUF_STATE_ERROR, it was calling
it only for VB2_BUF_STATE_DONE.

With that, the DVB thread were never called.

Cc: stable@vger.kernel.org # Kernel >= 4.3
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  • Loading branch information
mchehab committed Feb 4, 2016
1 parent fac710e commit 1f2c450
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/media/v4l2-core/videobuf2-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2742,7 +2742,7 @@ static int vb2_thread(void *data)
break;
try_to_freeze();

if (vb->state == VB2_BUF_STATE_DONE)
if (vb->state != VB2_BUF_STATE_ERROR)
if (threadio->fnc(vb, threadio->priv))
break;
call_void_qop(q, wait_finish, q);
Expand Down

0 comments on commit 1f2c450

Please sign in to comment.