Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca45fe8e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 50ef2951 cb50f548

drivers/media/video/ivtv/ivtv-fileops.c

+4 −2
Original line number Diff line number Diff line
@@ -755,6 +755,8 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts) 
	}

	if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_YUV)

		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;