From b0c46c6c7de22a4ac3766713f65f0556e5ba930b Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 6 Feb 2010 02:17:17 -0300 Subject: [PATCH] --- yaml --- r: 181732 b: refs/heads/master c: fb640224ad9e4e33726b8762bcfed2a266243b4e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b2d0fac72a02..1f1f057adec6 100644 --- 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 index 8b4c3c9a723e..712b300f723f 100644 --- 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);