diff options
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_core.c')
-rw-r--r-- | drivers/pci/hotplug/cpqphp_core.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c index 4952c3b9379d..627274cc571f 100644 --- a/drivers/pci/hotplug/cpqphp_core.c +++ b/drivers/pci/hotplug/cpqphp_core.c | |||
@@ -868,11 +868,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
868 | /* TODO: This code can be made to support non-Compaq or Intel | 868 | /* TODO: This code can be made to support non-Compaq or Intel |
869 | * subsystem IDs | 869 | * subsystem IDs |
870 | */ | 870 | */ |
871 | rc = pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vid); | 871 | subsystem_vid = pdev->subsystem_vendor; |
872 | if (rc) { | ||
873 | err("%s : pci_read_config_word failed\n", __func__); | ||
874 | goto err_disable_device; | ||
875 | } | ||
876 | dbg("Subsystem Vendor ID: %x\n", subsystem_vid); | 872 | dbg("Subsystem Vendor ID: %x\n", subsystem_vid); |
877 | if ((subsystem_vid != PCI_VENDOR_ID_COMPAQ) && (subsystem_vid != PCI_VENDOR_ID_INTEL)) { | 873 | if ((subsystem_vid != PCI_VENDOR_ID_COMPAQ) && (subsystem_vid != PCI_VENDOR_ID_INTEL)) { |
878 | err(msg_HPC_non_compaq_or_intel); | 874 | err(msg_HPC_non_compaq_or_intel); |
@@ -887,11 +883,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
887 | goto err_disable_device; | 883 | goto err_disable_device; |
888 | } | 884 | } |
889 | 885 | ||
890 | rc = pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &subsystem_deviceid); | 886 | subsystem_deviceid = pdev->subsystem_device; |
891 | if (rc) { | ||
892 | err("%s : pci_read_config_word failed\n", __func__); | ||
893 | goto err_free_ctrl; | ||
894 | } | ||
895 | 887 | ||
896 | info("Hot Plug Subsystem Device ID: %x\n", subsystem_deviceid); | 888 | info("Hot Plug Subsystem Device ID: %x\n", subsystem_deviceid); |
897 | 889 | ||