aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2007-08-22 20:52:21 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:08:17 -0300
commit4823e9ee9f45c78777d040742b5e46336a42c8b3 (patch)
treec67b4d69da1649cca17a571ccd7d3d5dd79dd8c3 /drivers/media
parent426d523664e01c778f6455e9b3bbd40dda76c66a (diff)
V4L/DVB (6167): cx23885: Changed PCI quirks to after bridge detech
Changed the pci_quirks function to detech the bridge type before setting the NMI clear bit, rather than detecting based on unique board id. 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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx23885/cx23885-core.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 69167294708..d2bc3e58662 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -622,11 +622,9 @@ static int cx23885_pci_quirks(struct cx23885_dev *dev)
{
dprintk(1, "%s()\n", __FUNCTION__);
- switch(dev->board) {
- case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
+ if(dev->bridge == CX23885_BRIDGE_885)
cx_clear(RDR_TLCTL0, 1 << 4);
- break;
- }
+
return 0;
}
@@ -777,8 +775,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
dev->board, card[dev->nr] == dev->board ?
"insmod option" : "autodetected");
- cx23885_pci_quirks(dev);
-
/* Configure the internal memory */
if(dev->pci->device == 0x8880) {
dev->bridge = CX23885_BRIDGE_887;
@@ -791,6 +787,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
dprintk(1, "%s() Memory configured for PCIe bridge type %d\n",
__FUNCTION__, dev->bridge);
+ cx23885_pci_quirks(dev);
+
/* init hardware */
cx23885_reset(dev);