diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-18 20:58:51 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-18 20:58:51 +0200 |
| commit | 6c093022de6610694c4b629afcdf18201a4cbadc (patch) | |
| tree | 83da1dc18d0f17ffd434030d00892dd407a7516a /linux/drivers/media/video/ivtv/ivtv-fileops.c | |
| parent | 10d95c49de7046635946793e094e6f76dfeadd5c (diff) | |
| download | mediapointer-dvb-s2-6c093022de6610694c4b629afcdf18201a4cbadc.tar.gz mediapointer-dvb-s2-6c093022de6610694c4b629afcdf18201a4cbadc.tar.bz2 | |
ivtv: fix udma yuv bug
From: Ian Armstrong <ian@iarmst.demon.co.uk>
Using udma yuv causes the driver becomes locked into that mode. This prevents
use of the mpeg decoder & non-udma yuv output. This patch clears the
operating mode when the device is closed.
Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-fileops.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-fileops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c index 82c60c28b..b2ff2488d 100644 --- a/linux/drivers/media/video/ivtv/ivtv-fileops.c +++ b/linux/drivers/media/video/ivtv/ivtv-fileops.c @@ -753,9 +753,11 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts) ivtv_yuv_close(itv); } if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_YUV) - itv->output_mode = OUT_NONE; + itv->output_mode = OUT_NONE; + else if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_UDMA_YUV) + itv->output_mode = OUT_NONE; else if (s->type == IVTV_DEC_STREAM_TYPE_MPG && itv->output_mode == OUT_MPG) - itv->output_mode = OUT_NONE; + itv->output_mode = OUT_NONE; itv->speed = 0; clear_bit(IVTV_F_I_DEC_PAUSED, &itv->i_flags); |