- cx88: add timeout error counter.

3 files changed, 11 insertions, 9 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index 03969ebc1..e06ec1ca8 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -115,11 +115,13 @@ static int dvb_thread(void *data)
 		spin_unlock_irqrestore(dev->dvbq.irqlock,flags);
 
 		/* log errors if any */
-		if (dev->error_count || dev->stopper_count) {
-			printk("%s: error=%d stopper=%d\n",
-			       dev->core->name, dev->error_count, dev->stopper_count);
-			dev->error_count = 0;
+		if (dev->error_count || dev->stopper_count || dev->timeout_count) {
+			printk("%s: error=%d stopper=%d timeout=%d\n",
+			       dev->core->name, dev->error_count,
+			       dev->stopper_count, dev->timeout_count);
+			dev->error_count   = 0;
 			dev->stopper_count = 0;
+			dev->timeout_count = 0;
 		}
 	}
 
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c
index a0445baf5..a02423473 100644
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-mpeg.c,v 1.6 2004/08/31 11:58:53 kraxel Exp $
+ * $Id: cx88-mpeg.c,v 1.7 2004/08/31 14:08:45 kraxel Exp $
  *
  *  Support for the mpeg transport stream transfers
  *  PCI function #2 of the cx2388x.
@@ -204,7 +204,6 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
 static void cx8802_timeout(unsigned long data)
 {
 	struct cx8802_dev *dev = (struct cx8802_dev*)data;
-	struct cx88_core *core = dev->core;
 	struct cx88_dmaqueue *q = &dev->mpegq;
 	struct cx88_buffer *buf;
 	unsigned long flags;
@@ -216,8 +215,8 @@ static void cx8802_timeout(unsigned long data)
 #endif
 
 	cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]);
-
-	cx_clear(MO_TS_DMACNTRL, 0x11); /* disable TS RISC and FIFO */
+	cx8802_shutdown(dev);
+	dev->timeout_count++;
 
 	spin_lock_irqsave(&dev->slock,flags);
 	while (!list_empty(&q->active)) {
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 9db2c04df..4fe56091b 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88.h,v 1.27 2004/08/31 11:58:53 kraxel Exp $
+ * $Id: cx88.h,v 1.28 2004/08/31 14:08:45 kraxel Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -371,6 +371,7 @@ struct cx8802_dev {
 	/* error stats */
 	u32                        stopper_count;
 	u32                        error_count;
+	u32                        timeout_count;
 
 	/* for blackbird only */
 	struct list_head           devlist;