diff options
| author | Michael Hunold <devnull@localhost> | 2004-01-26 13:51:56 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-01-26 13:51:56 +0000 |
| commit | 7bbbd381417ba9860149d901f3eaeb872bff8d15 (patch) | |
| tree | c0c9f69e22b8f1875ca81efac5b858409cdc4ba7 /linux/drivers/media/common | |
| parent | 79a0122a3496f9276eb29e5e30afd9899473efc1 (diff) | |
| download | mediapointer-dvb-s2-7bbbd381417ba9860149d901f3eaeb872bff8d15.tar.gz mediapointer-dvb-s2-7bbbd381417ba9860149d901f3eaeb872bff8d15.tar.bz2 | |
- make sure to disable clipping before capturing, otherwise capturing may
not work
- make sure to disable the right video dma at capture stop
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_hlp.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/common/saa7146_hlp.c b/linux/drivers/media/common/saa7146_hlp.c index bcba0ab48..cb846432e 100644 --- a/linux/drivers/media/common/saa7146_hlp.c +++ b/linux/drivers/media/common/saa7146_hlp.c @@ -1018,6 +1018,7 @@ void saa7146_set_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, struc saa7146_set_window(dev, buf->fmt->width, buf->fmt->height, buf->fmt->field); saa7146_set_output_format(dev, sfmt->trans); + saa7146_disable_clipping(dev); if ( vv->last_field == V4L2_FIELD_INTERLACED ) { } else if ( vv->last_field == V4L2_FIELD_TOP ) { diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 13bb853e9..34fac4396 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -755,7 +755,7 @@ static int video_end(struct saa7146_fh *fh, struct file *file) dmas = MASK_22 | MASK_21 | MASK_20; } else { resource = RESOURCE_DMA1_HPS; - dmas = MASK_20; + dmas = MASK_22; } saa7146_res_free(fh, resource); |