diff options
author | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2005-12-01 03:51:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:48:57 -0500 |
commit | 50ab5edc973c979e8f620e09d20b96761d271894 (patch) | |
tree | 7be7c4416bb650c1c1c0d5845c2f0369e9956b35 /drivers/media/video/bttv-driver.c | |
parent | 3b86b9999deb04bbfbb20e6b6fe1119a4bf0ff34 (diff) |
[PATCH] V4L: Fix read() bugs in bttv driver
Fix read() bugs in bttv driver.
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/bttv-driver.c')
-rw-r--r-- | drivers/media/video/bttv-driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index 5bc522259d36..f9d581cd31db 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c | |||
@@ -2952,6 +2952,8 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait) | |||
2952 | fh->cap.read_buf->memory = V4L2_MEMORY_USERPTR; | 2952 | fh->cap.read_buf->memory = V4L2_MEMORY_USERPTR; |
2953 | field = videobuf_next_field(&fh->cap); | 2953 | field = videobuf_next_field(&fh->cap); |
2954 | if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,field)) { | 2954 | if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,field)) { |
2955 | kfree (fh->cap.read_buf); | ||
2956 | fh->cap.read_buf = NULL; | ||
2955 | up(&fh->cap.lock); | 2957 | up(&fh->cap.lock); |
2956 | return POLLERR; | 2958 | return POLLERR; |
2957 | } | 2959 | } |