Merge branches 'pci/hotplug', 'pci/pci_is_bridge' and 'pci/virtualization' into next

[linux.git] / arch / x86 / pci / fixup.c

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index ef334a003f3cc58c3e815e64f5e9837556b53b46..b5e60268d93fa0d19ffb793921e409aa13f9a12b 100644 (file)
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -338,9 +338,7 @@ static void pci_fixup_video(struct pci_dev *pdev)
                 * type BRIDGE, or CARDBUS. Host to PCI controllers use
                 * PCI header type NORMAL.
                 */
-               if (bridge
-                   && ((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE)
-                      || (bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) {
+               if (bridge && (pci_is_bridge(bridge))) {
                        pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
                                                &config);
                        if (!(config & PCI_BRIDGE_CTL_VGA))