[media] cx23885: disable MSI for NetUP cards, otherwise CI is not working

Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index d778b1a..9933810 100644 (file)
--- 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 (file)
--- 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 */