Commit 1bcf9749 authored Apr 18, 2020 by Christophe JAILLET Committed by Greg Kroah-Hartman Jun 25, 2020

m68k/PCI: Fix a memory leak in an error handling path



[ Upstream commit c3f4ec050f56eeab7c1f290321f9b762c95bd332 ]

If 'ioremap' fails, we must free 'bridge', as done in other error handling
path bellow.

Fixes: 19cc4c84 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent e70fd099

arch/m68k/coldfire/pci.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);