2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/media/video/ivtv/ivtv-queue.c b/drivers/media/video/ivtv/ivtv-queue.c
index 39a216713244..3e1deec67a5e 100644
--- a/drivers/media/video/ivtv/ivtv-queue.c
+++ b/drivers/media/video/ivtv/ivtv-queue.c
@@ -51,7 +51,7 @@ void ivtv_queue_init(struct ivtv_queue *q)
 
 void ivtv_enqueue(struct ivtv_stream *s, struct ivtv_buffer *buf, struct ivtv_queue *q)
 {
-        unsigned long flags = 0;
+        unsigned long flags;
 
         /* clear the buffer if it is going to be enqueued to the free queue */
         if (q == &s->q_free) {
@@ -71,7 +71,7 @@ void ivtv_enqueue(struct ivtv_stream *s, struct ivtv_buffer *buf, struct ivtv_qu
 struct ivtv_buffer *ivtv_dequeue(struct ivtv_stream *s, struct ivtv_queue *q)
 {
         struct ivtv_buffer *buf = NULL;
-        unsigned long flags = 0;
+        unsigned long flags;
 
         spin_lock_irqsave(&s->qlock, flags);
         if (!list_empty(&q->list)) {
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 137a1ff4a149..fe742fdfae07 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -742,14 +742,13 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
 {
         enum v4l2_field field;
         unsigned long flags = 0;
-        unsigned size, nbufs;
+        unsigned size = 0, nbufs = 1;
         int retval;
 
         MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
         mutex_lock(&q->vb_lock);
 
-        nbufs = 1; size = 0;
         q->ops->buf_setup(q, &nbufs, &size);
 
         if (NULL == q->read_buf  &&