Commit 8f3acca9 authored by Bjorn Helgaas's avatar Bjorn Helgaas

PCI/portdrv: Cleanup error paths

Make the straightline path the normal no-error path.  Check for errors and
return them directly, instead of checking for success and putting the
normal path in an "if" body.

No functional change.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent ef83b078
......@@ -344,11 +344,13 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)
device_enable_async_suspend(device);
retval = device_register(device);
if (retval)
if (retval) {
kfree(pcie);
else
get_device(device);
return retval;
return retval;
}
get_device(device);
return 0;
}
/**
......@@ -498,12 +500,12 @@ static int pcie_port_probe_service(struct device *dev)
pciedev = to_pcie_device(dev);
status = driver->probe(pciedev);
if (!status) {
dev_printk(KERN_DEBUG, dev, "service driver %s loaded\n",
driver->name);
get_device(dev);
}
return status;
if (status)
return status;
dev_printk(KERN_DEBUG, dev, "service driver %s loaded\n", driver->name);
get_device(dev);
return 0;
}
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment