diff options
-rw-r--r-- | drivers/media/video/saa7134/saa7134-ts.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c index cc8b923afbc0..b8ff459d0d30 100644 --- a/drivers/media/video/saa7134/saa7134-ts.c +++ b/drivers/media/video/saa7134/saa7134-ts.c | |||
@@ -65,7 +65,7 @@ static int buffer_activate(struct saa7134_dev *dev, | |||
65 | /* start DMA */ | 65 | /* start DMA */ |
66 | saa7134_set_dmabits(dev); | 66 | saa7134_set_dmabits(dev); |
67 | 67 | ||
68 | mod_timer(&dev->ts_q.timeout, jiffies+BUFFER_TIMEOUT); | 68 | mod_timer(&dev->ts_q.timeout, jiffies+TS_BUFFER_TIMEOUT); |
69 | 69 | ||
70 | if (dev->ts_state == SAA7134_TS_BUFF_DONE) { | 70 | if (dev->ts_state == SAA7134_TS_BUFF_DONE) { |
71 | /* Clear TS cache */ | 71 | /* Clear TS cache */ |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 1d190e5e1ac4..8229ab213223 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -376,6 +376,7 @@ struct saa7134_board { | |||
376 | #define INTERLACE_OFF 2 | 376 | #define INTERLACE_OFF 2 |
377 | 377 | ||
378 | #define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ | 378 | #define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ |
379 | #define TS_BUFFER_TIMEOUT msecs_to_jiffies(1000) /* 1 second */ | ||
379 | 380 | ||
380 | struct saa7134_dev; | 381 | struct saa7134_dev; |
381 | struct saa7134_dma; | 382 | struct saa7134_dma; |