diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-01-31 17:10:32 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-31 17:10:32 +0100 |
| commit | 412ee7cd3dc581a37b7d15a5147a556e45445be1 (patch) | |
| tree | 3a2acd8e946a8f335c8a7671941733a35c72c58e /drivers/pci/hotplug/pciehp_hpc.c | |
| parent | Merge branch 'pci/hotplug' into next (diff) | |
| parent | PCI: Add dummy pci_irqd_intx_xlate() for CONFIG_PCI=n build (diff) | |
| download | linux-412ee7cd3dc581a37b7d15a5147a556e45445be1.tar.xz linux-412ee7cd3dc581a37b7d15a5147a556e45445be1.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Add dummy pci_irqd_intx_xlate() for CONFIG_PCI=n build
PCI: Add wrappers for dev_printk()
PCI: Remove unnecessary messages for memory allocation failures
PCI: Add #defines for Completion Timeout Disable feature
hinic: Replace PCI pool old API
net: e100: Replace PCI pool old API
block: DAC960: Replace PCI pool old API
MAINTAINERS: Include more PCI files
PCI: Remove unneeded kallsyms include
powerpc/pci: Unroll two pass loop when scanning bridges
powerpc/pci: Use for_each_pci_bridge() helper
Diffstat (limited to 'drivers/pci/hotplug/pciehp_hpc.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index a89d8b990228..17bea7ccf6d4 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -838,10 +838,9 @@ struct controller *pcie_init(struct pcie_device *dev) struct pci_dev *pdev = dev->port; ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL); - if (!ctrl) { - dev_err(&dev->device, "%s: Out of memory\n", __func__); + if (!ctrl) goto abort; - } + ctrl->pcie = dev; pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, &slot_cap); |