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

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

media: v4l2-ctrls.c: fix epoll() by calling poll_wait first 



The epoll function expects that whenever the poll file op is
called, the poll_wait function is also called. That didn't
always happen in v4l2_ctrl_poll(). Fix this, otherwise epoll()
would timeout when it shouldn't.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 914c6868

drivers/media/v4l2-core/v4l2-ctrls.c

+1 −1
Original line number Diff line number Diff line
@@ -4166,9 +4166,9 @@ __poll_t v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait) 
{

	struct v4l2_fh *fh = file->private_data;



	poll_wait(file, &fh->wait, wait);

	if (v4l2_event_pending(fh))

		return EPOLLPRI;

	poll_wait(file, &fh->wait, wait);

	return 0;

}

EXPORT_SYMBOL(v4l2_ctrl_poll);