diff --git a/[refs] b/[refs]
index 8b1b7cfecfcc..4461668f53d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e5d0b16dada536dfe2f1e893b6ad0225ff8a2c9
+refs/heads/master: d013598d9a46befebdfd37195829ce411e4878ea
diff --git a/trunk/drivers/pci/pcie/portdrv_core.c b/trunk/drivers/pci/pcie/portdrv_core.c
index 079bbc3ed4f8..52c4e6fd6fd4 100644
--- a/trunk/drivers/pci/pcie/portdrv_core.c
+++ b/trunk/drivers/pci/pcie/portdrv_core.c
@@ -297,6 +297,10 @@ int pcie_port_device_register(struct pci_dev *dev)
 	int status, capabilities, irq_mode, i, nr_serv;
 	int vectors[PCIE_PORT_DEVICE_MAXSERVICES];
 
+	capabilities = get_port_device_capability(dev);
+	if (!capabilities)
+		return -ENODEV;
+
 	port_data = kzalloc(sizeof(*port_data), GFP_KERNEL);
 	if (!port_data)
 		return -ENOMEM;
@@ -304,8 +308,6 @@ int pcie_port_device_register(struct pci_dev *dev)
 
 	port_data->port_type = dev->pcie_type;
 
-	capabilities = get_port_device_capability(dev);
-
 	irq_mode = assign_interrupt_mode(dev, vectors, capabilities);
 	if (irq_mode == PCIE_PORT_NO_IRQ) {
 		/*