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: Alan Cox <alan@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index de14818d5cc4..d23a42b1504f 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -4991,7 +4991,7 @@ void __devinit bttv_check_chipset(void)
         int pcipci_fail = 0;
         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;
         if (pci_pci_problems & (PCIPCI_TRITON|PCIPCI_NATOMA|PCIPCI_VIAETBF))
                 triton1 = 1;
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index be3a81fc90a2..09aa62f61af7 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -843,7 +843,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                         latency = 0x0A;
                 }
 #endif
-                if (pci_pci_problems & PCIPCI_FAIL) {
+                if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL)) {
                         printk(KERN_INFO "%s: quirk: this driver and your "
                                         "chipset may not work together"
                                         " in overlay mode.\n",dev->name);