diff options
author | Igor M. Liplianin <liplianin@me.by> | 2011-01-25 15:07:00 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:32:18 -0400 |
commit | 702dd7903bda0b83f6f6cb66fdadc4e5bbb60646 (patch) | |
tree | 29afbbd7336599e4166c8f59753a1542352620a3 /drivers/media/video/cx23885 | |
parent | 10d0dcd73c619d86b8ba1c9cd753ce749f578bf4 (diff) |
[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>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 4 | ||||
-rw-r--r-- | 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 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) | |||
1041 | 1041 | ||
1042 | cx23885_dev_checkrevision(dev); | 1042 | cx23885_dev_checkrevision(dev); |
1043 | 1043 | ||
1044 | /* disable MSI for NetUP cards, otherwise CI is not working */ | ||
1045 | if (cx23885_boards[dev->board].ci_type > 0) | ||
1046 | cx_clear(RDR_RDRCTL1, 1 << 8); | ||
1047 | |||
1044 | return 0; | 1048 | return 0; |
1045 | } | 1049 | } |
1046 | 1050 | ||
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 | |||
292 | #define RDR_CFG0 0x00050000 | 292 | #define RDR_CFG0 0x00050000 |
293 | #define RDR_CFG1 0x00050004 | 293 | #define RDR_CFG1 0x00050004 |
294 | #define RDR_CFG2 0x00050008 | 294 | #define RDR_CFG2 0x00050008 |
295 | #define RDR_RDRCTL1 0x0005030c | ||
295 | #define RDR_TLCTL0 0x00050318 | 296 | #define RDR_TLCTL0 0x00050318 |
296 | 297 | ||
297 | /* APB DMAC Current Buffer Pointer */ | 298 | /* APB DMAC Current Buffer Pointer */ |