V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices

Implement timed measurement of encoder operation for the first time it
is run.  This allows the driver to note when the encoder has been run
successfully for at least 1/4 second.  On top of that implement
various bits to ensure that the encoder has been run once before
digital streaming for OnAir devices.  This is done via several core
state machine tweaks.

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

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index 324d1bd8500d..c46d367f7472 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -278,11 +278,20 @@ static int pvr2_encoder_cmd(void *ctxt,
                         ret = -EBUSY;
                 }
                 if (ret) {
+                        del_timer_sync(&hdw->encoder_run_timer);
                         hdw->state_encoder_ok = 0;
                         pvr2_trace(PVR2_TRACE_STBITS,
                                    "State bit %s <-- %s",
                                    "state_encoder_ok",
                                    (hdw->state_encoder_ok ? "true" : "false"));
+                        if (hdw->state_encoder_runok) {
+                                hdw->state_encoder_runok = 0;
+                                pvr2_trace(PVR2_TRACE_STBITS,
+                                   "State bit %s <-- %s",
+                                           "state_encoder_runok",
+                                           (hdw->state_encoder_runok ?
+                                            "true" : "false"));
+                        }
                         pvr2_trace(
                                 PVR2_TRACE_ERROR_LEGS,
                                 "Giving up on command."