2 files changed, 14 insertions, 4 deletions

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index abf410943cc9..3c2cc270ccd5 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -823,6 +823,12 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
 
         IVTV_DEBUG_FILE("close() of %s\n", s->name);
 
+        if (id->type == IVTV_DEC_STREAM_TYPE_YUV &&
+                test_bit(IVTV_F_I_DECODING_YUV, &itv->i_flags)) {
+                /* Restore registers we've changed & clean up any mess */
+                ivtv_yuv_close(itv);
+        }
+
         /* Stop decoding */
         if (test_bit(IVTV_F_S_STREAMING, &s->s_flags)) {
                 IVTV_DEBUG_INFO("close stopping decode\n");
@@ -832,10 +838,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
         }
         clear_bit(IVTV_F_S_APPL_IO, &s->s_flags);
         clear_bit(IVTV_F_S_STREAMOFF, &s->s_flags);
-        if (id->type == IVTV_DEC_STREAM_TYPE_YUV && test_bit(IVTV_F_I_DECODING_YUV, &itv->i_flags)) {
-                /* Restore registers we've changed & clean up any mess we've made */
-                ivtv_yuv_close(itv);
-        }
+
         if (itv->output_mode == OUT_UDMA_YUV && id->yuv_frames)
                 itv->output_mode = OUT_NONE;
 
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 5441dc205966..9ecacab4b89b 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -670,6 +670,10 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
                         width, height, p->audio_properties)) {
                 IVTV_DEBUG_WARN("Couldn't initialize decoder source\n");
         }
+
+        /* Decoder sometimes dies here, so wait a moment */
+        ivtv_msleep_timeout(10, 0);
+
         return 0;
 }
 
@@ -709,6 +713,9 @@ int ivtv_start_v4l2_decode_stream(struct ivtv_stream *s, int gop_offset)
         /* start playback */
         ivtv_vapi(itv, CX2341X_DEC_START_PLAYBACK, 2, gop_offset, 0);
 
+        /* Let things settle before we actually start */
+        ivtv_msleep_timeout(10, 0);
+
         /* Clear the following Interrupt mask bits for decoding */
         ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_DECODE);
         IVTV_DEBUG_IRQ("IRQ Mask is now: 0x%08x\n", itv->irqmask);