diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-05 09:54:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-05 09:54:49 +0200 |
| commit | 4241119eeb14f762e2d7f6e7c52afd22cea1de37 (patch) | |
| tree | 655a153ca0517acb93b1eea776bad49ce5d8b050 /arch/arm64/kernel/pci.c | |
| parent | e73ad5ff2f76da25390e9607cb549691639330c3 (diff) | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
| download | blackbird-op-linux-4241119eeb14f762e2d7f6e7c52afd22cea1de37.tar.gz blackbird-op-linux-4241119eeb14f762e2d7f6e7c52afd22cea1de37.zip | |
Merge tag 'v4.12-rc4' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 4f0e3ebfea4b..c7e3e6387a49 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -191,8 +191,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) { |
