diff options
| -rw-r--r-- | arch/ia64/pci/fixup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/pci/fixup.c b/arch/ia64/pci/fixup.c index eee069a0b539..1fe9aa5068ea 100644 --- a/arch/ia64/pci/fixup.c +++ b/arch/ia64/pci/fixup.c | |||
| @@ -49,9 +49,7 @@ static void pci_fixup_video(struct pci_dev *pdev) | |||
| 49 | * type BRIDGE, or CARDBUS. Host to PCI controllers use | 49 | * type BRIDGE, or CARDBUS. Host to PCI controllers use |
| 50 | * PCI header type NORMAL. | 50 | * PCI header type NORMAL. |
| 51 | */ | 51 | */ |
| 52 | if (bridge | 52 | if (bridge && (pci_is_bridge(bridge))) { |
| 53 | &&((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE) | ||
| 54 | ||(bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) { | ||
| 55 | pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, | 53 | pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, |
| 56 | &config); | 54 | &config); |
| 57 | if (!(config & PCI_BRIDGE_CTL_VGA)) | 55 | if (!(config & PCI_BRIDGE_CTL_VGA)) |