summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2007-09-04 20:50:49 -0400
committerSteven Toth <stoth@hauppauge.com>2007-09-04 20:50:49 -0400
commite5cce4fcf308517725ec7a4d553c8458dcb81372 (patch)
tree660becf2180f8f344fd7566364e4a42bd3f5ba5a /linux/drivers/media/video
parent39e0925525b119b8717d8ddf4811b3c92776c177 (diff)
downloadmediapointer-dvb-s2-e5cce4fcf308517725ec7a4d553c8458dcb81372.tar.gz
mediapointer-dvb-s2-e5cce4fcf308517725ec7a4d553c8458dcb81372.tar.bz2
cx23885: Minor cleanup and important NMI comment placed in code.
From: Steven Toth <stoth@hauppauge.com> I wanted to document the NMI assert issue inside the code, even though it's already documented in the patch history. If/when the next cx23887 revision appears, is may need to be enabled on that also. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-core.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c
index b19192810..c32d836b6 100644
--- a/linux/drivers/media/video/cx23885/cx23885-core.c
+++ b/linux/drivers/media/video/cx23885/cx23885-core.c
@@ -332,8 +332,8 @@ static int cx23885_risc_decode(u32 risc)
[ RISC_WRITECR >> 28 ] = "writecr",
};
static int incr[16] = {
- [ RISC_WRITE >> 28 ] = 3, // 2
- [ RISC_JUMP >> 28 ] = 3, // 2
+ [ RISC_WRITE >> 28 ] = 3,
+ [ RISC_JUMP >> 28 ] = 3,
[ RISC_SKIP >> 28 ] = 1,
[ RISC_SYNC >> 28 ] = 1,
[ RISC_WRITERM >> 28 ] = 3,
@@ -630,6 +630,10 @@ static int cx23885_pci_quirks(struct cx23885_dev *dev)
{
dprintk(1, "%s()\n", __FUNCTION__);
+ /* The cx23885 bridge has a weird bug which causes NMI to be asserted
+ * when DMA begins if RDR_TLCTL0 bit4 is not cleared. It does not
+ * occur on the cx23887 bridge.
+ */
if(dev->bridge == CX23885_BRIDGE_885)
cx_clear(RDR_TLCTL0, 1 << 4);