From b261d6b684600130bb4ac2d1180f53043931a422 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 7 Mar 2009 00:21:30 -0300
Subject: [PATCH] --- yaml --- r: 138279 b: refs/heads/master c:
 af78e16b5d5ba74566814ba0f50ee1d736d933a5 h: refs/heads/master i:   138277:
 c03c3151e60dc0ae3051d11275f5b3cc7cd0351d   138275:
 78464766c22b58ea716d33a3ebe3bd064b7b6e8f   138271:
 3a0d8ee23e032f8d5cc82b620f7a1ae754419352 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/pvrusb2/pvrusb2-hdw.c | 65 +++++++++++--------
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 16688043fc36..1ec22a7126cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6907205bcbe7b8bcdc0720bc75e1d2558162d017
+refs/heads/master: af78e16b5d5ba74566814ba0f50ee1d736d933a5
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 65e65a4f2ec0..74b365f1cfd2 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1655,19 +1655,29 @@ static const char *pvr2_get_state_name(unsigned int st)
 
 static int pvr2_decoder_enable(struct pvr2_hdw *hdw,int enablefl)
 {
-	if (!hdw->decoder_ctrl) {
-		if (!hdw->flag_decoder_missed) {
-			pvr2_trace(PVR2_TRACE_ERROR_LEGS,
-				   "WARNING: No decoder present");
-			hdw->flag_decoder_missed = !0;
-			trace_stbit("flag_decoder_missed",
-				    hdw->flag_decoder_missed);
-		}
-		return -EIO;
+	if (hdw->decoder_ctrl) {
+		hdw->decoder_ctrl->enable(hdw->decoder_ctrl->ctxt, enablefl);
+		return 0;
 	}
-	hdw->decoder_ctrl->enable(hdw->decoder_ctrl->ctxt,enablefl);
-	// ?????
-	return 0;
+	/* Even though we really only care about the video decoder chip at
+	   this point, we'll broadcast stream on/off to all sub-devices
+	   anyway, just in case somebody else wants to hear the
+	   command... */
+	v4l2_device_call_all(&hdw->v4l2_dev, 0, video, s_stream, enablefl);
+	if (hdw->decoder_client_id) {
+		/* We get here if the encoder has been noticed.  Otherwise
+		   we'll issue a warning to the user (which should
+		   normally never happen). */
+		return 0;
+	}
+	if (!hdw->flag_decoder_missed) {
+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+			   "WARNING: No decoder present");
+		hdw->flag_decoder_missed = !0;
+		trace_stbit("flag_decoder_missed",
+			    hdw->flag_decoder_missed);
+	}
+	return -EIO;
 }
 
 
@@ -4009,23 +4019,26 @@ int pvr2_hdw_cmd_powerdown(struct pvr2_hdw *hdw)
 
 int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *hdw)
 {
-	if (!hdw->decoder_ctrl) {
-		pvr2_trace(PVR2_TRACE_INIT,
-			   "Unable to reset decoder: nothing attached");
-		return -ENOTTY;
+	pvr2_trace(PVR2_TRACE_INIT,
+		   "Requesting decoder reset");
+	if (hdw->decoder_ctrl) {
+		if (!hdw->decoder_ctrl->force_reset) {
+			pvr2_trace(PVR2_TRACE_INIT,
+				   "Unable to reset decoder: not implemented");
+			return -ENOTTY;
+		}
+		hdw->decoder_ctrl->force_reset(hdw->decoder_ctrl->ctxt);
+		return 0;
+	} else {
 	}
-
-	if (!hdw->decoder_ctrl->force_reset) {
-		pvr2_trace(PVR2_TRACE_INIT,
-			   "Unable to reset decoder: not implemented");
-		return -ENOTTY;
+	if (hdw->decoder_client_id) {
+		v4l2_device_call_all(&hdw->v4l2_dev, hdw->decoder_client_id,
+				     core, reset, 0);
+		return 0;
 	}
-
 	pvr2_trace(PVR2_TRACE_INIT,
-		   "Requesting decoder reset");
-	hdw->decoder_ctrl->force_reset(hdw->decoder_ctrl->ctxt);
-	// ?????
-	return 0;
+		   "Unable to reset decoder: nothing attached");
+	return -ENOTTY;
 }