From 5e90759c11c5655b054abc0f0c40266f4256e0db Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 10 Oct 2011 11:09:56 -0300 Subject: [PATCH] --- yaml --- r: 271978 b: refs/heads/master c: a461e0ad3d27b6342140566909a80db30d151a91 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-video.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 39a73d3e97ad..64269b88f219 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19696f09daeff897a672144be89a16b8df18c004 +refs/heads/master: a461e0ad3d27b6342140566909a80db30d151a91 diff --git a/trunk/drivers/media/video/cx23885/cx23885-video.c b/trunk/drivers/media/video/cx23885/cx23885-video.c index c91be47c91ae..e730b9263016 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-video.c +++ b/trunk/drivers/media/video/cx23885/cx23885-video.c @@ -549,6 +549,9 @@ static int cx23885_start_video_dma(struct cx23885_dev *dev, { dprintk(1, "%s()\n", __func__); + /* Stop the dma/fifo before we tamper with it's risc programs */ + cx_clear(VID_A_DMA_CTL, 0x11); + /* setup fifo + format */ cx23885_sram_channel_setup(dev, &dev->sram_channels[SRAM_CH01], buf->bpl, buf->risc.dma);