aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 19900c66b799..c91be47c91ae 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -1536,29 +1536,29 @@ int cx23885_video_irq(struct cx23885_dev *dev, u32 status)
1536 1536
1537 cx_write(VID_A_INT_STAT, status); 1537 cx_write(VID_A_INT_STAT, status);
1538 1538
1539 /* risc op code error */ 1539 /* risc op code error, fifo overflow or line sync detection error */
1540 if ((status & VID_BC_MSK_OPC_ERR) || 1540 if ((status & VID_BC_MSK_OPC_ERR) ||
1541 (status & VID_BC_MSK_SYNC) || 1541 (status & VID_BC_MSK_SYNC) ||
1542 (status & VID_BC_MSK_OF)) { 1542 (status & VID_BC_MSK_OF)) {
1543 1543
1544 if (status & VID_BC_MSK_OPC_ERR) 1544 if (status & VID_BC_MSK_OPC_ERR) {
1545 dprintk(7, " (VID_BC_MSK_OPC_ERR 0x%08x)\n", 1545 dprintk(7, " (VID_BC_MSK_OPC_ERR 0x%08x)\n",
1546 VID_BC_MSK_OPC_ERR); 1546 VID_BC_MSK_OPC_ERR);
1547 printk(KERN_WARNING "%s: video risc op code error\n",
1548 dev->name);
1549 cx23885_sram_channel_dump(dev,
1550 &dev->sram_channels[SRAM_CH01]);
1551 }
1547 1552
1548 if (status & VID_BC_MSK_SYNC) 1553 if (status & VID_BC_MSK_SYNC)
1549 dprintk(7, " (VID_BC_MSK_SYNC 0x%08x)\n", 1554 dprintk(7, " (VID_BC_MSK_SYNC 0x%08x) "
1555 "video lines miss-match\n",
1550 VID_BC_MSK_SYNC); 1556 VID_BC_MSK_SYNC);
1551 1557
1552 if (status & VID_BC_MSK_OF) 1558 if (status & VID_BC_MSK_OF)
1553 dprintk(7, " (VID_BC_MSK_OF 0x%08x)\n", 1559 dprintk(7, " (VID_BC_MSK_OF 0x%08x) fifo overflow\n",
1554 VID_BC_MSK_OF); 1560 VID_BC_MSK_OF);
1555 1561
1556 printk(KERN_WARNING "%s: video risc op code error\n",
1557 dev->name);
1558
1559 cx_clear(VID_A_DMA_CTL, 0x11);
1560 cx23885_sram_channel_dump(dev, &dev->sram_channels[SRAM_CH01]);
1561
1562 } 1562 }
1563 1563
1564 /* Video */ 1564 /* Video */