diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-22 10:28:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-22 10:28:38 +0100 |
| commit | e1c51aa8705fd78e5259e0515aad3b5003e18550 (patch) | |
| tree | 3728628142a24460d6b488e5331f421f902e5d3a /arch/arm64/kernel/pci.c | |
| parent | 6e49b7fa3083c30688b7fff1b37ed891cd1c30af (diff) | |
| parent | 08556e03ad36b2c6219aba90de88ccf58038e208 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linaro-lsk-v4.9-rt-test
Diffstat (limited to 'arch/arm64/kernel/pci.c')
| -rw-r--r-- | arch/arm64/kernel/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index 409abc45bdb6..1b3eb67edefb 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -175,8 +175,10 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) return NULL; root_ops = kzalloc_node(sizeof(*root_ops), GFP_KERNEL, node); - if (!root_ops) + if (!root_ops) { + kfree(ri); return NULL; + } ri->cfg = pci_acpi_setup_ecam_mapping(root); if (!ri->cfg) { |