From cb5f36c937b408622bf1dc019fc1cecbebc1ee48 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@hauppauge.com>
Date: Tue, 14 Aug 2007 23:35:16 -0300
Subject: [PATCH] --- yaml --- r: 65855 b: refs/heads/master c:
 426d523664e01c778f6455e9b3bbd40dda76c66a h: refs/heads/master i:   65853:
 5b2ce8b35da0e63badd589f03a57dfaae5a37f04   65851:
 dd677f8517e8b0365d7d7cb6e017d5ef3903a95e   65847:
 1bf338da0ae61a46aa7aaf9a3921edfe5a02c305   65839:
 996f4f552246b03dea40399bdda84e66c3653485   65823:
 c3ffa061f0ab4a512a4898afbe68e6e1637c0ec4   65791:
 c7fb569a5ce2627408b173810965e768e780c011 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1017aaed0744..0b72cefff92e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b86b580244511f9b2fb2043d813e9c4c7d294a62
+refs/heads/master: 426d523664e01c778f6455e9b3bbd40dda76c66a
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
index 3e1b62a2d50d..691672947084 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-core.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -759,8 +759,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)
@@ -779,6 +777,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;