From 4a88fd6766a8d4d587807363fdab2789f2b5f7d4 Mon Sep 17 00:00:00 2001
From: Ian Armstrong <ian@iarmst.demon.co.uk>
Date: Sat, 6 Mar 2010 21:37:04 -0300
Subject: [PATCH] --- yaml --- r: 192775 b: refs/heads/master c:
 9a766d55b72a439b2e16ecf2ac3eb831ab25e0d3 h: refs/heads/master i:   192773:
 5ab5203a29e2e470d4f18e94d6d940b4bc3fe70e   192771:
 107455e968be7f5d0ec365e3fc0d853004fe4fae   192767:
 09a5654fad59edc0e44e23c367d9f3c0e3897b9a v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-streams.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 47db702fbf19..9c124b159789 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 283328c29db4463c31ee59f9ab418449cfa376b3
+refs/heads/master: 9a766d55b72a439b2e16ecf2ac3eb831ab25e0d3
diff --git a/trunk/drivers/media/video/ivtv/ivtv-streams.c b/trunk/drivers/media/video/ivtv/ivtv-streams.c
index a994b0adb444..6917c497fb7e 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-streams.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-streams.c
@@ -829,6 +829,10 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
 		ivtv_set_irq_mask(itv, IVTV_IRQ_ENC_VIM_RST);
 	}
 
+	/* Raw-passthrough is implied on start. Make sure it's stopped so
+	   the encoder will re-initialize when next started */
+	ivtv_vapi(itv, CX2341X_ENC_STOP_CAPTURE, 3, 1, 2, 7);
+
 	wake_up(&s->waitq);
 
 	return 0;