Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 426d5236 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent b86b5802

drivers/media/video/cx23885/cx23885-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;