Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf5c7cbb authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] videobuf2: only start streaming in poll() if so requested by the poll mask 



Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarPawel Osciak <pawel@osciak.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d0b66fdf

drivers/media/video/videobuf2-core.c

+5 −2
Original line number Diff line number Diff line
@@ -1647,6 +1647,7 @@ static int __vb2_cleanup_fileio(struct vb2_queue *q); 
 */

unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)

{

	unsigned long req_events = poll_requested_events(wait);

	unsigned long flags;

	unsigned int ret;

	struct vb2_buffer *vb = NULL;
@@ -1655,12 +1656,14 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) 
	 * Start file I/O emulator only if streaming API has not been used yet.

	 */

	if (q->num_buffers == 0 && q->fileio == NULL) {

		if (!V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_READ)) {

		if (!V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_READ) &&

				(req_events & (POLLIN | POLLRDNORM))) {

			ret = __vb2_init_fileio(q, 1);

			if (ret)

				return POLLERR;

		}

		if (V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_WRITE)) {

		if (V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_WRITE) &&

				(req_events & (POLLOUT | POLLWRNORM))) {

			ret = __vb2_init_fileio(q, 0);

			if (ret)

				return POLLERR;