From b4893beab7bb57b3dd43c5287f1486d6dc0ea4ac Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Sat, 28 Apr 2012 09:57:02 -0300 Subject: [PATCH] --- yaml --- r: 306408 b: refs/heads/master c: cb04af205e4b1f0aaa9010726faf95da67f10152 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 2 -- trunk/drivers/media/video/em28xx/em28xx.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d6205f51cd66..90766a99f0cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60332f033d4c8655e0afcea932e16d44646e82bf +refs/heads/master: cb04af205e4b1f0aaa9010726faf95da67f10152 diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index 5dd6806c75ab..fcc713f8098d 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -3080,9 +3080,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev, /* init video dma queues */ INIT_LIST_HEAD(&dev->vidq.active); - INIT_LIST_HEAD(&dev->vidq.queued); INIT_LIST_HEAD(&dev->vbiq.active); - INIT_LIST_HEAD(&dev->vbiq.queued); if (dev->board.has_msp34xx) { /* Send a reset to other chips via gpio */ diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h index 9486eacc6e0f..009a95a4cb02 100644 --- a/trunk/drivers/media/video/em28xx/em28xx.h +++ b/trunk/drivers/media/video/em28xx/em28xx.h @@ -255,7 +255,6 @@ struct em28xx_buffer { struct em28xx_dmaqueue { struct list_head active; - struct list_head queued; wait_queue_head_t wq;