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;