]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
media: vb2: fix VBI/poll regression
authorHans Verkuil <hans.verkuil@cisco.com>
Sat, 20 Sep 2014 19:16:35 +0000 (16:16 -0300)
committerJiri Slaby <jslaby@suse.cz>
Mon, 13 Oct 2014 14:09:20 +0000 (16:09 +0200)
commit1d5b4f75c30a69df306e53869d44206555147c62
tree6f74c0ecf622c84174fb8ce51cb7b51e2cc48bf6
parent91d5b067629d4880f8ce6386c6af6bd64579e124
media: vb2: fix VBI/poll regression

commit 58d75f4b1ce26324b4d809b18f94819843a98731 upstream.

The recent conversion of saa7134 to vb2 unconvered a poll() bug that
broke the teletext applications alevt and mtt. These applications
expect that calling poll() without having called VIDIOC_STREAMON will
cause poll() to return POLLERR. That did not happen in vb2.

This patch fixes that behavior. It also fixes what should happen when
poll() is called when STREAMON is called but no buffers have been
queued. In that case poll() will also return POLLERR, but only for
capture queues since output queues will always return POLLOUT
anyway in that situation.

This brings the vb2 behavior in line with the old videobuf behavior.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/media/v4l2-core/videobuf2-core.c
include/media/videobuf2-core.h