summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2007-08-14 22:35:16 -0400
committerSteven Toth <stoth@hauppauge.com>2007-08-14 22:35:16 -0400
commit70da119d40723b6973d59d17b139788b4a49f394 (patch)
tree7f52b2cb864286b954d5643fe9f57567921542e3 /linux/drivers/media/video/cx23885
parente45d8f8b1692ef3d9d73da2c24139610168dcdb2 (diff)
downloadmediapointer-dvb-s2-70da119d40723b6973d59d17b139788b4a49f394.tar.gz
mediapointer-dvb-s2-70da119d40723b6973d59d17b139788b4a49f394.tar.bz2
cx23885: Ensure pci_quirks is called after board identification.
From: Steven Toth <stoth@hauppauge.com> The pci_quirks function was being called too early during initialisation, it needs to be called after the board has been identified. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/cx23885')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c
index 715a2905b..e4fa031bc 100644
--- a/linux/drivers/media/video/cx23885/cx23885-core.c
+++ b/linux/drivers/media/video/cx23885/cx23885-core.c
@@ -769,8 +769,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
dev->bmmio = (u8 __iomem *)dev->lmmio;
- cx23885_pci_quirks(dev);
-
/* board config */
dev->board = UNSET;
if (card[dev->nr] < cx23885_bcount)
@@ -789,6 +787,8 @@ 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;