diff options
author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2020-04-18 10:07:51 +0300 |
---|---|---|
committer | Greg Ungerer <gerg@kernel.org> | 2020-05-25 03:32:20 +0300 |
commit | c3f4ec050f56eeab7c1f290321f9b762c95bd332 (patch) | |
tree | cf1cc87b4050f88e7d6f39f1c25e2965f35262fb | |
parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) | |
download | linux-c3f4ec050f56eeab7c1f290321f9b762c95bd332.tar.xz |
m68k/PCI: Fix a memory leak in an error handling path
If 'ioremap' fails, we must free 'bridge', as done in other error handling
path bellow.
Fixes: 19cc4c843f40 ("m68k/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
-rw-r--r-- | arch/m68k/coldfire/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c index 62b0eb6cf69a..84eab0f5e00a 100644 --- a/arch/m68k/coldfire/pci.c +++ b/arch/m68k/coldfire/pci.c @@ -216,8 +216,10 @@ static int __init mcf_pci_init(void) /* Keep a virtual mapping to IO/config space active */ iospace = (unsigned long) ioremap(PCI_IO_PA, PCI_IO_SIZE); - if (iospace == 0) + if (iospace == 0) { + pci_free_host_bridge(bridge); return -ENODEV; + } pr_info("Coldfire: PCI IO/config window mapped to 0x%x\n", (u32) iospace); |