diff options
-rw-r--r-- | arch/x86/pci/fixup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index 94ae9ae9574f..e5f000c02177 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c | |||
@@ -337,9 +337,7 @@ static void pci_fixup_video(struct pci_dev *pdev) | |||
337 | * type BRIDGE, or CARDBUS. Host to PCI controllers use | 337 | * type BRIDGE, or CARDBUS. Host to PCI controllers use |
338 | * PCI header type NORMAL. | 338 | * PCI header type NORMAL. |
339 | */ | 339 | */ |
340 | if (bridge | 340 | if (bridge && (pci_is_bridge(bridge))) { |
341 | && ((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE) | ||
342 | || (bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) { | ||
343 | pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, | 341 | pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, |
344 | &config); | 342 | &config); |
345 | if (!(config & PCI_BRIDGE_CTL_VGA)) | 343 | if (!(config & PCI_BRIDGE_CTL_VGA)) |