From f403b66ff62eabb0fd2a19e421ae6ec8b0921a88 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 8 Oct 2012 08:33:29 -0300 Subject: [PATCH] --- yaml --- r: 343784 b: refs/heads/master c: 30cfbee36d2fef3bf5a4634a34494bac2df4f271 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/cx23885/cx23885-core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0565d628d9e0..33367c2e2323 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 542fb082b9c76af8e71e9ea286d2dafdfba27099 +refs/heads/master: 30cfbee36d2fef3bf5a4634a34494bac2df4f271 diff --git a/trunk/drivers/media/pci/cx23885/cx23885-core.c b/trunk/drivers/media/pci/cx23885/cx23885-core.c index 697728f09430..4189d6431d3c 100644 --- a/trunk/drivers/media/pci/cx23885/cx23885-core.c +++ b/trunk/drivers/media/pci/cx23885/cx23885-core.c @@ -1516,8 +1516,7 @@ int cx23885_restart_queue(struct cx23885_tsport *port, buf = list_entry(q->queued.next, struct cx23885_buffer, vb.queue); if (NULL == prev) { - list_del(&buf->vb.queue); - list_add_tail(&buf->vb.queue, &q->active); + list_move_tail(&buf->vb.queue, &q->active); cx23885_start_dma(port, q, buf); buf->vb.state = VIDEOBUF_ACTIVE; buf->count = q->count++; @@ -1528,8 +1527,7 @@ int cx23885_restart_queue(struct cx23885_tsport *port, } else if (prev->vb.width == buf->vb.width && prev->vb.height == buf->vb.height && prev->fmt == buf->fmt) { - list_del(&buf->vb.queue); - list_add_tail(&buf->vb.queue, &q->active); + list_move_tail(&buf->vb.queue, &q->active); buf->vb.state = VIDEOBUF_ACTIVE; buf->count = q->count++; prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);