diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 23:18:36 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 23:18:36 +0200 |
| commit | 7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch) | |
| tree | 56b0d5f9d16eb18744e102f3f216715196cd62e6 /drivers/media/video/saa7164/saa7164-vbi.c | |
| parent | Input: tsc2007 - add open and close methods (diff) | |
| parent | Linux 3.1-rc4 (diff) | |
| download | linux-7e66eaf14e19c032433be7c4df3c892fa2a5282f.tar.xz linux-7e66eaf14e19c032433be7c4df3c892fa2a5282f.zip | |
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-vbi.c')
| -rw-r--r-- | drivers/media/video/saa7164/saa7164-vbi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c index bc1fcedba874..e2e034158718 100644 --- a/drivers/media/video/saa7164/saa7164-vbi.c +++ b/drivers/media/video/saa7164/saa7164-vbi.c @@ -1192,7 +1192,6 @@ static unsigned int fops_poll(struct file *file, poll_table *wait) { struct saa7164_vbi_fh *fh = (struct saa7164_vbi_fh *)file->private_data; struct saa7164_port *port = fh->port; - struct saa7164_user_buffer *ubuf; unsigned int mask = 0; port->last_poll_msecs_diff = port->last_poll_msecs; @@ -1224,10 +1223,7 @@ static unsigned int fops_poll(struct file *file, poll_table *wait) } /* Pull the first buffer from the used list */ - ubuf = list_first_entry(&port->list_buf_used.list, - struct saa7164_user_buffer, list); - - if (ubuf) + if (!list_empty(&port->list_buf_used.list)) mask |= POLLIN | POLLRDNORM; return mask; |