[media] tm6000: fix an uninitialized variable

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>

diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
index eab23413a909ff04f32bb2720504dbbb4e18ab85..1a6857929c15716aa4bcd516e97b2b0726948336 100644 (file)
--- a/drivers/media/usb/tm6000/tm6000-video.c
+++ b/drivers/media/usb/tm6000/tm6000-video.c
@@ -1455,14 +1455,14 @@ __tm6000_poll(struct file *file, struct poll_table_struct *wait)
                if (list_empty(&fh->vb_vidq.stream))
                        return res | POLLERR;
                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)) {
                /* read() capture */
                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;
 }