From: Mike Isely <isely@pobox.com>
Date: Sat, 6 Feb 2010 05:17:17 +0000 (-0300)
Subject: V4L/DVB: pvrusb2: Adjust 300msec digitizer wait to be more selective
X-Git-Tag: v5.15~30585^2~38
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fb640224ad9e4e33726b8762bcfed2a266243b4e;p=mirror_ubuntu-kernels.git

V4L/DVB: pvrusb2: Adjust 300msec digitizer wait to be more selective

We know that the 300msec settling time after starting the digitizer is
only really needed when the digitizer is a SAA7115.  So if we're not
using a SAA7115, skip the delay.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 8b4c3c9a723e..712b300f723f 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/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);