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

Commit 4a567394 authored by figo.zhang's avatar figo.zhang Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11852): saa7134-video.c: poll method lose race condition 



saa7134-video.c: poll method lose race condition

Signed-off-by: default avatarFigo Zhang <figo.zhang@kolorific.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7d853532

drivers/media/video/saa7134/saa7134-video.c

+6 −3
Original line number Diff line number Diff line
@@ -1423,11 +1423,13 @@ video_poll(struct file *file, struct poll_table_struct *wait) 
{

	struct saa7134_fh *fh = file->private_data;

	struct videobuf_buffer *buf = NULL;

	unsigned int rc = 0;



	if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type)

		return videobuf_poll_stream(file, &fh->vbi, wait);



	if (res_check(fh,RESOURCE_VIDEO)) {

		mutex_lock(&fh->cap.vb_lock);

		if (!list_empty(&fh->cap.stream))

			buf = list_entry(fh->cap.stream.next, struct videobuf_buffer, stream);

	} else {
@@ -1446,13 +1448,14 @@ video_poll(struct file *file, struct poll_table_struct *wait) 
	}



	if (!buf)

		return POLLERR;

		goto err;



	poll_wait(file, &buf->done, wait);

	if (buf->state == VIDEOBUF_DONE ||

	    buf->state == VIDEOBUF_ERROR)

		return POLLIN|POLLRDNORM;

	return 0;

		rc = POLLIN|POLLRDNORM;

	mutex_unlock(&fh->cap.vb_lock);

	return rc;



err:

	mutex_unlock(&fh->cap.vb_lock);