diff options
| author | Steven Toth <stoth@hauppauge.com> | 2007-08-14 23:35:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 22:08:16 -0300 |
| commit | 426d523664e01c778f6455e9b3bbd40dda76c66a (patch) | |
| tree | 2981840a4827065148546238c3c34cdd132f1ef1 | |
| parent | b86b580244511f9b2fb2043d813e9c4c7d294a62 (diff) | |
| download | op-kernel-dev-426d523664e01c778f6455e9b3bbd40dda76c66a.zip op-kernel-dev-426d523664e01c778f6455e9b3bbd40dda76c66a.tar.gz | |
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>
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index 3e1b62a..6916729 100644 --- 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; |
