V4L/DVB (6166): cx23885: Ensure pci_quirks is called after board identification

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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 3e1b62a2d50d838b769d81b321fac4b600daa378..6916729470846fe16f5210206bcab52cb5a3d0f7 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/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;