Merge branch 'stable/for-jens-3.13-take-two' of git://git.kernel.org/pub/scm/linux...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / pci / pcie / portdrv_core.c

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 31063ac..08d131f 100644 (file)
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -260,13 +260,14 @@ static int get_port_device_capability(struct pci_dev *dev)
        if (pcie_ports_disabled)
                return 0;
 
-       err = pcie_port_platform_notify(dev, &cap_mask);
-       if (!pcie_ports_auto) {
-               cap_mask = PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP
-                               | PCIE_PORT_SERVICE_VC;
-               if (pci_aer_available())
-                       cap_mask |= PCIE_PORT_SERVICE_AER;
-       } else if (err) {
+       cap_mask = PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP
+                       | PCIE_PORT_SERVICE_VC;
+       if (pci_aer_available())
+               cap_mask |= PCIE_PORT_SERVICE_AER;
+
+       if (pcie_ports_auto) {
+               err = pcie_port_platform_notify(dev, &cap_mask);
+               if (err)
                        return 0;
        }