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 8b4c3c9a723e332359913254ee1da77bbefa8fe1..712b300f723f04d46ae2cea4e86db09ff457c8c4 100644 (file)
--- 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);