---

yaml --- r: 271976 b: refs/heads/master c: d44aa2d h: refs/heads/master v: v3
git-mirror · Oct 14, 2011 · e8aa4fe · e8aa4fe
1 parent ef78053
commit e8aa4fe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84f42af66535a57875b72678126c4238142ad4be
+refs/heads/master: d44aa2d7fc9fba30cf81f25ba33f1caf73e8fbb8
diff --git a/trunk/drivers/media/video/cx23885/cx23885-video.c b/trunk/drivers/media/video/cx23885/cx23885-video.c
@@ -1510,10 +1510,6 @@ static void cx23885_vid_timeout(unsigned long data)
 	struct cx23885_buffer *buf;
 	unsigned long flags;
 
-	cx23885_sram_channel_dump(dev, &dev->sram_channels[SRAM_CH01]);
-
-	cx_clear(VID_A_DMA_CTL, 0x11);
-
 	spin_lock_irqsave(&dev->slock, flags);
 	while (!list_empty(&q->active)) {
 		buf = list_entry(q->active.next,