AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

V4L/DVB (6167): cx23885: Changed PCI quirks to after bridge detech

Browse Source 
Changed the pci_quirks function to detech the bridge type before setting
the NMI clear bit, rather than detecting based on unique board id.

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>
This commit is contained in:
Steven Toth 2007-08-22 20:52:21 -03:00 committed by Mauro Carvalho Chehab
parent 426d523664
commit 4823e9ee9f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/cx23885/cx23885-core.c
View File

@ -622,11 +622,9 @@ static int cx23885_pci_quirks(struct cx23885_dev *dev)
{ {
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __FUNCTION__);
switch(dev->board) { if(dev->bridge == CX23885_BRIDGE_885)
case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
cx_clear(RDR_TLCTL0, 1 << 4); cx_clear(RDR_TLCTL0, 1 << 4);
break;
}
return 0; return 0;
} }
@ -777,8 +775,6 @@ 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;
@ -791,6 +787,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
dprintk(1, "%s() Memory configured for PCIe bridge type %d\n", dprintk(1, "%s() Memory configured for PCIe bridge type %d\n",
__FUNCTION__, dev->bridge); __FUNCTION__, dev->bridge);
cx23885_pci_quirks(dev);
/* init hardware */ /* init hardware */
cx23885_reset(dev); cx23885_reset(dev);