2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index aca972bbfb4c..dd7e0c51a33e 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -278,8 +278,8 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
 
 static int is_shpc_capable(struct pci_dev *dev)
 {
-        if ((dev->vendor == PCI_VENDOR_ID_AMD) || (dev->device ==
-                                                PCI_DEVICE_ID_AMD_GOLAM_7450))
+        if (dev->vendor == PCI_VENDOR_ID_AMD &&
+            dev->device == PCI_DEVICE_ID_AMD_GOLAM_7450)
                 return 1;
         if (!pci_find_capability(dev, PCI_CAP_ID_SHPC))
                 return 0;
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 36547f0ce305..75ba2311b54f 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -944,8 +944,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
         ctrl->pci_dev = pdev;  /* pci_dev of the P2P bridge */
         ctrl_dbg(ctrl, "Hotplug Controller:\n");
 
-        if ((pdev->vendor == PCI_VENDOR_ID_AMD) || (pdev->device ==
-                                PCI_DEVICE_ID_AMD_GOLAM_7450)) {
+        if (pdev->vendor == PCI_VENDOR_ID_AMD &&
+            pdev->device == PCI_DEVICE_ID_AMD_GOLAM_7450) {
                 /* amd shpc driver doesn't use Base Offset; assume 0 */
                 ctrl->mmio_base = pci_resource_start(pdev, 0);
                 ctrl->mmio_size = pci_resource_len(pdev, 0);