summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-queue.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-03-18 09:40:43 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-03-18 09:40:43 -0300
commit9dc9f909cf3815bc60336feecea6dce9f437f042 (patch)
tree995941d39233691aab80d0a61cd5c0e402aede17 /linux/drivers/media/video/ivtv/ivtv-queue.c
parentb1fad223c39000c4e5e8be80928035406ae8ccce (diff)
parentbf840a1818e11630aa2cd995cb96fca712d1a314 (diff)
downloadmediapointer-dvb-s2-9dc9f909cf3815bc60336feecea6dce9f437f042.tar.gz
mediapointer-dvb-s2-9dc9f909cf3815bc60336feecea6dce9f437f042.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/tda18271
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-queue.c')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-queue.c b/linux/drivers/media/video/ivtv/ivtv-queue.c
index 39a216713..3e1deec67 100644
--- a/linux/drivers/media/video/ivtv/ivtv-queue.c
+++ b/linux/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)) {