3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 03d31860851b..3ed4703956d3 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -517,6 +517,7 @@ struct ivtv_stream {
 struct ivtv_open_id {
         u32 open_id;
         int type;
+        int yuv_frames;
         enum v4l2_priority prio;
         struct ivtv *itv;
 };
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 1f3c8d0310f5..62ee41c5220b 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -757,6 +757,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
                 IVTV_DEBUG_INFO("close stopping decode\n");
 
                 ivtv_stop_v4l2_decode_stream(s, flags, pts);
+                itv->output_mode = OUT_NONE;
         }
         clear_bit(IVTV_F_S_APPL_IO, &s->s_flags);
         clear_bit(IVTV_F_S_STREAMOFF, &s->s_flags);
@@ -764,11 +765,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
                 /* Restore registers we've changed & clean up any mess we've made */
                 ivtv_yuv_close(itv);
         }
-        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)
+        if (itv->output_mode == OUT_UDMA_YUV && id->yuv_frames)
                 itv->output_mode = OUT_NONE;
 
         itv->speed = 0;
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index ed5707660e0e..2bb1e324785b 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1346,6 +1346,8 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg)
                         ivtv_release_stream(s);
                         return -EBUSY;
                 }
+                /* Mark that this file handle started the UDMA_YUV mode */
+                id->yuv_frames = 1;
                 if (args->y_source == NULL)
                         return 0;
                 return ivtv_yuv_prep_frame(itv, args);