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

Commit d2ff3ec8 authored by Janne Grunau's avatar Janne Grunau Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11230): hdpvr: return immediately from hdpvr_poll if data is available 



simplifies check for available data with hdpvr_get_next_buffer

Signed-off-by: default avatarJanne Grunau <j@jannau.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a50ab291

drivers/media/video/hdpvr/hdpvr-video.c

+8 −12
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ static ssize_t hdpvr_read(struct file *file, char __user *buffer, size_t count, 


static unsigned int hdpvr_poll(struct file *filp, poll_table *wait)

{

	struct hdpvr_buffer *buf = NULL;

	struct hdpvr_fh *fh = (struct hdpvr_fh *)filp->private_data;

	struct hdpvr_device *dev = fh->dev;

	unsigned int mask = 0;
@@ -499,19 +500,14 @@ static unsigned int hdpvr_poll(struct file *filp, poll_table *wait) 
	}

	mutex_unlock(&dev->io_mutex);



	buf = hdpvr_get_next_buffer(dev);

	/* only wait if no data is available */

	if (!buf || buf->status != BUFSTAT_READY) {

		poll_wait(filp, &dev->wait_data, wait);



	mutex_lock(&dev->io_mutex);

	if (!list_empty(&dev->rec_buff_list)) {



		struct hdpvr_buffer *buf = list_entry(dev->rec_buff_list.next,

						      struct hdpvr_buffer,

						      buff_list);



		if (buf->status == BUFSTAT_READY)

			mask |= POLLIN | POLLRDNORM;

		buf = hdpvr_get_next_buffer(dev);

	}

	mutex_unlock(&dev->io_mutex);

	if (buf && buf->status == BUFSTAT_READY)

		mask |= POLLIN | POLLRDNORM;



	return mask;

}