提交 426d5236 编写于 作者: S Steven Toth 提交者: Mauro Carvalho Chehab

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: NSteven Toth <stoth@hauppauge.com>
Signed-off-by: NMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 b86b5802
...@@ -759,8 +759,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) ...@@ -759,8 +759,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
dev->bmmio = (u8 __iomem *)dev->lmmio; dev->bmmio = (u8 __iomem *)dev->lmmio;
cx23885_pci_quirks(dev);
/* board config */ /* board config */
dev->board = UNSET; dev->board = UNSET;
if (card[dev->nr] < cx23885_bcount) if (card[dev->nr] < cx23885_bcount)
...@@ -779,6 +777,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) ...@@ -779,6 +777,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
dev->board, card[dev->nr] == dev->board ? dev->board, card[dev->nr] == dev->board ?
"insmod option" : "autodetected"); "insmod option" : "autodetected");
cx23885_pci_quirks(dev);
/* Configure the internal memory */ /* Configure the internal memory */
if(dev->pci->device == 0x8880) { if(dev->pci->device == 0x8880) {
dev->bridge = CX23885_BRIDGE_887; dev->bridge = CX23885_BRIDGE_887;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册