diff options
| author | Steven Toth <stoth@hauppauge.com> | 2007-08-22 19:52:21 -0400 |
|---|---|---|
| committer | Steven Toth <stoth@hauppauge.com> | 2007-08-22 19:52:21 -0400 |
| commit | 5818756e0a4b5b7a5c6c5c84dbce5dbe784fd8ae (patch) | |
| tree | 7ec2df2626a82165eae7b50acada5c4f279ff70b /linux/drivers | |
| parent | 70da119d40723b6973d59d17b139788b4a49f394 (diff) | |
| download | mediapointer-dvb-s2-5818756e0a4b5b7a5c6c5c84dbce5dbe784fd8ae.tar.gz mediapointer-dvb-s2-5818756e0a4b5b7a5c6c5c84dbce5dbe784fd8ae.tar.bz2 | |
cx23885: Changed PCI quirks to after bridge detech.
From: Steven Toth <stoth@hauppauge.com>
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>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-core.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c index e4fa031bc..01f993869 100644 --- a/linux/drivers/media/video/cx23885/cx23885-core.c +++ b/linux/drivers/media/video/cx23885/cx23885-core.c @@ -632,11 +632,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; } @@ -787,8 +785,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; @@ -801,6 +797,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); |