Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+4
-2
drivers/media/video/ivtv/ivtv-fileops.c
+4
-2
drivers/media/video/ivtv/ivtv-fileops.c
···
754
754
ivtv_yuv_close(itv);
755
755
}
756
756
if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_YUV)
757
-
itv->output_mode = OUT_NONE;
757
+
itv->output_mode = OUT_NONE;
758
+
else if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_UDMA_YUV)
759
+
itv->output_mode = OUT_NONE;
758
760
else if (s->type == IVTV_DEC_STREAM_TYPE_MPG && itv->output_mode == OUT_MPG)
759
-
itv->output_mode = OUT_NONE;
761
+
itv->output_mode = OUT_NONE;
760
762
761
763
itv->speed = 0;
762
764
clear_bit(IVTV_F_I_DEC_PAUSED, &itv->i_flags);