FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-04-06 01:42:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] tm6000: fix an uninitialized variable

Browse Source 
tm6000_poll could use an uninitialized buf pointer. Move the buf-handling
code inside the 'if' that initializes the buf pointer.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2013-02-07 07:05:43 -03:00 committed by Mauro Carvalho Chehab
parent bf5bbed15c
commit 82f0efbcd3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/usb/tm6000/tm6000-video.c
View File

@ -1455,14 +1455,14 @@ __tm6000_poll(struct file *file, struct poll_table_struct *wait)
if (list_empty(&fh->vb_vidq.stream)) if (list_empty(&fh->vb_vidq.stream))
return res | POLLERR; return res | POLLERR;
buf = list_entry(fh->vb_vidq.stream.next, struct tm6000_buffer, vb.stream); buf = list_entry(fh->vb_vidq.stream.next, struct tm6000_buffer, vb.stream);
poll_wait(file, &buf->vb.done, wait);
if (buf->vb.state == VIDEOBUF_DONE ||
buf->vb.state == VIDEOBUF_ERROR)
return res | POLLIN | POLLRDNORM;
} else if (req_events & (POLLIN | POLLRDNORM)) { } else if (req_events & (POLLIN | POLLRDNORM)) {
/* read() capture */ /* read() capture */
return res | videobuf_poll_stream(file, &fh->vb_vidq, wait); return res | videobuf_poll_stream(file, &fh->vb_vidq, wait);
} }
poll_wait(file, &buf->vb.done, wait);
if (buf->vb.state == VIDEOBUF_DONE ||
buf->vb.state == VIDEOBUF_ERROR)
return res | POLLIN | POLLRDNORM;
return res; return res;
} }