Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mike Isely and committed by
Mauro Carvalho Chehab
fb640224 91b5b489

+9 -4
+9 -4
drivers/media/video/pvrusb2/pvrusb2-hdw.c
··· 4625 4625 hdw->state_decoder_quiescent = 0; 4626 4626 hdw->state_decoder_ready = 0; 4627 4627 hdw->state_decoder_run = !0; 4628 - hdw->decoder_stabilization_timer.expires = 4629 - jiffies + 4630 - (HZ * TIME_MSEC_DECODER_STABILIZATION_WAIT / 1000); 4631 - add_timer(&hdw->decoder_stabilization_timer); 4628 + if (hdw->decoder_client_id == PVR2_CLIENT_ID_SAA7115) { 4629 + hdw->decoder_stabilization_timer.expires = 4630 + jiffies + 4631 + (HZ * TIME_MSEC_DECODER_STABILIZATION_WAIT / 4632 + 1000); 4633 + add_timer(&hdw->decoder_stabilization_timer); 4634 + } else { 4635 + hdw->state_decoder_ready = !0; 4636 + } 4632 4637 } 4633 4638 trace_stbit("state_decoder_quiescent",hdw->state_decoder_quiescent); 4634 4639 trace_stbit("state_decoder_run",hdw->state_decoder_run);