瀏覽代碼

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>
Steven Toth 18 年之前
父節點
當前提交
426d523664
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/media/video/cx23885/cx23885-core.c

+ 2 - 2
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;