diff options
| author | Mike Isely <isely@pobox.com> | 2010-02-06 02:17:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:11:06 -0300 |
| commit | fb640224ad9e4e33726b8762bcfed2a266243b4e (patch) | |
| tree | 1f475cace6bb78cc05feb3985e908140d595ede9 /drivers/media | |
| parent | 91b5b489c5ea0fb206922f1bfbd0bd843b6f326f (diff) | |
| download | linux-fb640224ad9e4e33726b8762bcfed2a266243b4e.tar.gz linux-fb640224ad9e4e33726b8762bcfed2a266243b4e.tar.bz2 linux-fb640224ad9e4e33726b8762bcfed2a266243b4e.zip | |
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 13 |
1 files changed, 9 insertions, 4 deletions
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); |