summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2011-10-10 11:09:56 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-10-14 17:23:20 -0300
commita461e0ad3d27b6342140566909a80db30d151a91 (patch)
tree8111c174346ca48b16f3f45e635ce4302c9df7fe /drivers/media
parent19696f09daeff897a672144be89a16b8df18c004 (diff)
downloadblackbird-op-linux-a461e0ad3d27b6342140566909a80db30d151a91.tar.gz
blackbird-op-linux-a461e0ad3d27b6342140566909a80db30d151a91.zip
[media] cx23885: Stop the risc video fifo before reconfiguring it
Safety reasons. We shouldn't be trying to reconfigure a risc processor instruction queue unless it's stopped. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index c91be47c91ae..e730b9263016 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/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);
OpenPOWER on IntegriCloud