Skip to content

Commit

Permalink
V4L/DVB (6166): cx23885: Ensure pci_quirks is called after board iden…
Browse files Browse the repository at this point in the history
…tification

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>
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Oct 10, 2007
1 parent b86b580 commit 426d523
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/cx23885/cx23885-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
Expand Down

0 comments on commit 426d523

Please sign in to comment.