Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03737439 authored by JoonSoo Kim's avatar JoonSoo Kim Committed by Benjamin Herrenschmidt
Browse files

powerpc: Change free_bootmem() to kfree() 



commit ea96025a('Don't use alloc_bootmem() in init_IRQ() path')
changed alloc_bootmem() to kzalloc(),
but missed to change free_bootmem() to kfree().
So correct it.

Signed-off-by: default avatarJoonsoo Kim <js1304@gmail.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent a53fd61a

arch/powerpc/platforms/82xx/pq2ads-pci-pic.c

+3 −5
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/spinlock.h>

#include <linux/irq.h>

#include <linux/types.h>

#include <linux/bootmem.h>

#include <linux/slab.h>



#include <asm/io.h>
@@ -149,7 +148,7 @@ int __init pq2ads_pci_init_irq(void) 
	priv->regs = of_iomap(np, 0);

	if (!priv->regs) {

		printk(KERN_ERR "Cannot map PCI PIC registers.\n");

		goto out_free_bootmem;

		goto out_free_kmalloc;

	}



	/* mask all PCI interrupts */
@@ -171,9 +170,8 @@ int __init pq2ads_pci_init_irq(void) 


out_unmap_regs:

	iounmap(priv->regs);

out_free_bootmem:

	free_bootmem((unsigned long)priv,

	             sizeof(struct pq2ads_pci_pic));

out_free_kmalloc:

	kfree(priv);

	of_node_put(np);

out_unmap_irq:

	irq_dispose_mapping(irq);