diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-01 04:58:39 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-01 04:58:39 -0300 |
commit | d7709cc1d93ee6c75fc6e421ae5e8646aff438a7 (patch) | |
tree | 811e21a51110680888635f01fedf0b85f219304e /linux/drivers/media/video/saa7134 | |
parent | 18f456ba66ff7f265cebbc7c0fa00c6ea2d6ae21 (diff) | |
parent | 355e218336f85e723e8061e62c292436b0654104 (diff) | |
download | mediapointer-dvb-s2-d7709cc1d93ee6c75fc6e421ae5e8646aff438a7.tar.gz mediapointer-dvb-s2-d7709cc1d93ee6c75fc6e421ae5e8646aff438a7.tar.bz2 |
merge: http://linuxtv.org/hg/~dougsland/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 26f1727e6..20b66cb8d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1448,7 +1448,7 @@ video_poll(struct file *file, struct poll_table_struct *wait) } if (!buf) - rc = POLLERR; + goto err; poll_wait(file, &buf->done, wait); if (buf->state == VIDEOBUF_DONE || |