summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2011-10-10 16:09:56 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-10-14 22:22:14 +0200
commitd44aa2d7fc9fba30cf81f25ba33f1caf73e8fbb8 (patch)
tree695ccd04cd63674161d71bca9e79851fda22cf83 /drivers/media/video
parent[media] cx23885: Removed a spurious function cx23885_set_scale() (diff)
downloadlinux-d44aa2d7fc9fba30cf81f25ba33f1caf73e8fbb8.tar.xz
linux-d44aa2d7fc9fba30cf81f25ba33f1caf73e8fbb8.zip
[media] cx23885: Avoid stopping the risc engine during buffer timeout
1. Removed the verbose 'dump channel state to console', very noisy in weak signal conditions. 2. No need for the video buffer timeout to stop the risc engine here. Clearer and easier to maintain if start_video_dma() is the single place that this is done. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 65b1bd2fc4e8..19900c66b799 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/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,