Commit 3d265c96 authored by Alan Cox's avatar Alan Cox Committed by Mauro Carvalho Chehab

V4L/DVB (4635): Extend bttv and saa7134 to check for both AGP and PCI PCI failure case

We could go and work out if the target object is AGP or PCI but the
corner case of an Athlon 64 era box with PCI video is sufficiently
unusual it doesn't seem worth the extra work, at least until other cases
if any pop up.
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 13f1371e
...@@ -4991,7 +4991,7 @@ void __devinit bttv_check_chipset(void) ...@@ -4991,7 +4991,7 @@ void __devinit bttv_check_chipset(void)
int pcipci_fail = 0; int pcipci_fail = 0;
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
if (pci_pci_problems & PCIPCI_FAIL) if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL)) /* should check if target is AGP */
pcipci_fail = 1; pcipci_fail = 1;
if (pci_pci_problems & (PCIPCI_TRITON|PCIPCI_NATOMA|PCIPCI_VIAETBF)) if (pci_pci_problems & (PCIPCI_TRITON|PCIPCI_NATOMA|PCIPCI_VIAETBF))
triton1 = 1; triton1 = 1;
......
...@@ -843,7 +843,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, ...@@ -843,7 +843,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
latency = 0x0A; latency = 0x0A;
} }
#endif #endif
if (pci_pci_problems & PCIPCI_FAIL) { if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL)) {
printk(KERN_INFO "%s: quirk: this driver and your " printk(KERN_INFO "%s: quirk: this driver and your "
"chipset may not work together" "chipset may not work together"
" in overlay mode.\n",dev->name); " in overlay mode.\n",dev->name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment