Skip to content

Commit

Permalink
PCI: portdrv: check capabilities first
Browse files Browse the repository at this point in the history
Move capability check capability to the beginning of
pcie_port_device_register() prevents redundant execution path.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Kenji Kaneshige authored and Jesse Barnes committed Dec 4, 2009
1 parent 9e5d0b1 commit d013598
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/pci/pcie/portdrv_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,17 @@ 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;
pci_set_drvdata(dev, port_data);

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) {
/*
Expand Down

0 comments on commit d013598

Please sign in to comment.