V4L/DVB (6158): Fix MT2131 tuner lock status problem

The mt2131 tuner reports lock even when the hardware should not
lock. This patch allows the s5h1409 demodulator to be configured to query
either the tuner driver for status, or the demodulator status when the
application requests lock status. This avoids returning false CARRIER
and/or SIGNAL lock status.

S5H1409 and MT2131 drivers.  This is the remainder of the changeset, which
only touches cx23885-dvb.c

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 4ff85f75f9f7..188a5a7819cb 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -84,7 +84,8 @@ static struct s5h1409_config hauppauge_hvr1800lp_config = {
         .output_mode   = S5H1409_SERIAL_OUTPUT,
         .gpio          = S5H1409_GPIO_OFF,
         .if_freq       = 44000,
-        .inversion     = S5H1409_INVERSION_OFF
+        .inversion     = S5H1409_INVERSION_OFF,
+        .status_mode   = S5H1409_DEMODLOCKING
 };
 
 static struct s5h1409_config hauppauge_hvr1800_config = {
@@ -92,7 +93,8 @@ static struct s5h1409_config hauppauge_hvr1800_config = {
         .output_mode   = S5H1409_SERIAL_OUTPUT,
         .gpio          = S5H1409_GPIO_ON,
         .if_freq       = 44000,
-        .inversion     = S5H1409_INVERSION_OFF
+        .inversion     = S5H1409_INVERSION_OFF,
+        .status_mode   = S5H1409_DEMODLOCKING
 };