diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 08:02:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 08:02:57 -0700 |
| commit | ca45fe8ea86f7a1cf11a6d3bf8bba082be4ea341 (patch) | |
| tree | a648796673c6f99fe7931c00e4891bab6bc1d48a | |
| parent | 50ef295119645215c076700e7ddf4869df5f56ce (diff) | |
| parent | cb50f548c0ee9b2aac39743fc4021a7188825a98 (diff) | |
| download | linux-ca45fe8ea86f7a1cf11a6d3bf8bba082be4ea341.tar.gz linux-ca45fe8ea86f7a1cf11a6d3bf8bba082be4ea341.tar.bz2 linux-ca45fe8ea86f7a1cf11a6d3bf8bba082be4ea341.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (6052): ivtv: fix udma yuv bug
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-fileops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c index 0285c4a830eb..66ea3cbc369c 100644 --- a/drivers/media/video/ivtv/ivtv-fileops.c +++ b/drivers/media/video/ivtv/ivtv-fileops.c @@ -754,9 +754,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); |