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 d778b1ae9217..9933810b4e33 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 a28772db11f0..c87ac682ebbe 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 */