Commit b7990bcf authored Feb 07, 2019 by Hans Verkuil Committed by Mauro Carvalho Chehab Feb 18, 2019

media: cec: 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 cec_poll(). Fix this, otherwise epoll()
would timeout when it shouldn't.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent 7e4e7162

drivers/media/cec/cec-api.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ static __poll_t cec_poll(struct file *filp,
		struct cec_adapter *adap = fh->adap;
		__poll_t res = 0;

		poll_wait(filp, &fh->wait, poll);
		if (!cec_is_registered(adap))
		return EPOLLERR \| EPOLLHUP;
		mutex_lock(&adap->lock);
		@@ -48,7 +49,6 @@ static __poll_t cec_poll(struct file *filp,
		res \|= EPOLLIN \| EPOLLRDNORM;
		if (fh->total_queued_events)
		res \|= EPOLLPRI;
		poll_wait(filp, &fh->wait, poll);
		mutex_unlock(&adap->lock);
		return res;
		}

Admin message