|
@@ -49,9 +49,7 @@ static void pci_fixup_video(struct pci_dev *pdev)
|
|
* type BRIDGE, or CARDBUS. Host to PCI controllers use
|
|
* type BRIDGE, or CARDBUS. Host to PCI controllers use
|
|
* PCI header type NORMAL.
|
|
* 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,
|
|
pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
|
|
&config);
|
|
&config);
|
|
if (!(config & PCI_BRIDGE_CTL_VGA))
|
|
if (!(config & PCI_BRIDGE_CTL_VGA))
|