Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-drm-fsl-dcu.git] / drivers / pci / pcie / portdrv_core.c

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 31063ac3099234941e0924e66e2fb4c277deee6d..0b6e76604068043d9c261ddb9461757d4e64c279 100644 (file)
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -46,7 +46,7 @@ static void release_pcie_device(struct device *dev)
  * pcie_port_msix_add_entry - add entry to given array of MSI-X entries
  * @entries: Array of MSI-X entries
  * @new_entry: Index of the entry to add to the array
- * @nr_entries: Number of entries aleady in the array
+ * @nr_entries: Number of entries already in the array
  *
  * Return value: Position of the added entry in the array
  */
@@ -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;
        }