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

Commit 2272a55f authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

powerpc: Rework qe_ic_init() so we can avoid freeing the irq_host 



If we do the call to of_address_to_resource() first, then we don't
need to worry about freeing the irq_host (which the code doesn't do
currently anyway).

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 84f1c1e0

arch/powerpc/sysdev/qe_lib/qe_ic.c

+4 −4
Original line number Diff line number Diff line
@@ -329,6 +329,10 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags, 
	struct resource res;

	u32 temp = 0, ret, high_active = 0;



	ret = of_address_to_resource(node, 0, &res);

	if (ret)

		return;



	qe_ic = alloc_bootmem(sizeof(struct qe_ic));

	if (qe_ic == NULL)

		return;
@@ -342,10 +346,6 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags, 
		return;

	}



	ret = of_address_to_resource(node, 0, &res);

	if (ret)

		return;



	qe_ic->regs = ioremap(res.start, res.end - res.start + 1);



	qe_ic->irqhost->host_data = qe_ic;