[PATCH 8/9 v3] cx23885: disable MSI for NetUP cards, otherwise CI is not working

[PATCH 8/9 v3] cx23885: disable MSI for NetUP cards, otherwise CI is not working

[Igor M. Liplianin]

Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
---
 drivers/media/video/cx23885/cx23885-core.c |    4 ++++
 drivers/media/video/cx23885/cx23885-reg.h  |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index d778b1a..9933810 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1041,6 +1041,10 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 
 	cx23885_dev_checkrevision(dev);
 
+	/* disable MSI for NetUP cards, otherwise CI is not working */
+	if (cx23885_boards[dev->board].ci_type > 0)
+		cx_clear(RDR_RDRCTL1, 1 << 8);
+
 	return 0;
 }
 
diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h
index a28772d..c87ac68 100644
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/drivers/media/video/cx23885/cx23885-reg.h
@@ -292,6 +292,7 @@ Channel manager Data Structure entry = 20 DWORD
 #define RDR_CFG0	0x00050000
 #define RDR_CFG1	0x00050004
 #define RDR_CFG2	0x00050008
+#define RDR_RDRCTL1	0x0005030c
 #define RDR_TLCTL0	0x00050318
 
 /* APB DMAC Current Buffer Pointer */
-- 
1.7.1

[PATCH 1/1] Update stv0900 status when LOCK is missed

[Abylay Ospan]

Update stv0900 status when LOCK is missed

Signed-off-by: Abylay Ospan <aospan@netup.ru>
---
  drivers/media/dvb/frontends/stv0900_core.c |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/media/dvb/frontends/stv0900_core.c 
b/drivers/media/dvb/frontends/stv0900_core.c
index 4f5e7d3..34afcc6 100644
--- a/drivers/media/dvb/frontends/stv0900_core.c
+++ b/drivers/media/dvb/frontends/stv0900_core.c
@@ -1660,8 +1660,10 @@ static int stv0900_read_status(struct 
dvb_frontend *fe, enum fe_status *status)
                         | FE_HAS_VITERBI
                         | FE_HAS_SYNC
                         | FE_HAS_LOCK;
-       } else
+       } else {
+               *status = 0;
                 dprintk("DEMOD LOCK FAIL\n");
+       }

         return 0;
  }
--
1.7.2.1.95.g3d045

-- 
Abylai Ospan<aospan@netup.ru>
NetUP Inc.