Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 343785
b: refs/heads/master
c: 8d6b125
h: refs/heads/master
i:
  343783: ab3b7ad
v: v3
  • Loading branch information
Wei Yongjun authored and Mauro Carvalho Chehab committed Oct 25, 2012
1 parent f403b66 commit 0794d43
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 30cfbee36d2fef3bf5a4634a34494bac2df4f271
refs/heads/master: 8d6b12501a7ebc59c309b32457192bba93334e0b
6 changes: 2 additions & 4 deletions trunk/drivers/media/pci/cx88/cx88-mpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ static int cx8802_restart_queue(struct cx8802_dev *dev,
return 0;
buf = list_entry(q->queued.next, struct cx88_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);
cx8802_start_dma(dev, q, buf);
buf->vb.state = VIDEOBUF_ACTIVE;
buf->count = q->count++;
Expand All @@ -229,8 +228,7 @@ static int cx8802_restart_queue(struct cx8802_dev *dev,
} 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);
Expand Down

0 comments on commit 0794d43

Please sign in to comment.