---

yaml --- r: 181732 b: refs/heads/master c: fb64022 h: refs/heads/master v: v3
git-mirror · Feb 26, 2010 · b0c46c6 · b0c46c6
1 parent 3a0e4a5
commit b0c46c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91b5b489c5ea0fb206922f1bfbd0bd843b6f326f
+refs/heads/master: fb640224ad9e4e33726b8762bcfed2a266243b4e
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -4625,10 +4625,15 @@ static int state_eval_decoder_run(struct pvr2_hdw *hdw)
 		hdw->state_decoder_quiescent = 0;
 		hdw->state_decoder_ready = 0;
 		hdw->state_decoder_run = !0;
-		hdw->decoder_stabilization_timer.expires =
-			jiffies +
-			(HZ * TIME_MSEC_DECODER_STABILIZATION_WAIT / 1000);
-		add_timer(&hdw->decoder_stabilization_timer);
+		if (hdw->decoder_client_id == PVR2_CLIENT_ID_SAA7115) {
+			hdw->decoder_stabilization_timer.expires =
+				jiffies +
+				(HZ * TIME_MSEC_DECODER_STABILIZATION_WAIT /
+				 1000);
+			add_timer(&hdw->decoder_stabilization_timer);
+		} else {
+			hdw->state_decoder_ready = !0;
+		}
 	}
 	trace_stbit("state_decoder_quiescent",hdw->state_decoder_quiescent);
 	trace_stbit("state_decoder_run",hdw->state_decoder_run);