[PATCH 5/5] powerpc-MSI-HSTA: Move three assignments in hsta_msi_probe()
From: SF Markus Elfring <hidden>
Date: 2016-08-29 11:13:36
Also in:
kernel-janitors, lkml
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
From: Markus Elfring <redacted> Date: Mon, 29 Aug 2016 11:30:48 +0200 Move the assignments for three data structure members to the end so that they will only be performed if the desired resource allocations succeeded by this function. Signed-off-by: Markus Elfring <redacted> --- arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
index 3097ddd..57014ce 100644
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c@@ -143,10 +143,7 @@ static int hsta_msi_probe(struct platform_device *pdev) return -EINVAL; } - ppc4xx_hsta_msi.dev = dev; - ppc4xx_hsta_msi.address = mem->start; ppc4xx_hsta_msi.data = ioremap(mem->start, resource_size(mem)); - ppc4xx_hsta_msi.irq_count = irq_count; if (!ppc4xx_hsta_msi.data) { dev_err(dev, "Unable to map memory\n"); return -ENOMEM;
@@ -179,6 +176,10 @@ static int hsta_msi_probe(struct platform_device *pdev) phb->controller_ops.setup_msi_irqs = hsta_setup_msi_irqs; phb->controller_ops.teardown_msi_irqs = hsta_teardown_msi_irqs; } + + ppc4xx_hsta_msi.dev = dev; + ppc4xx_hsta_msi.address = mem->start; + ppc4xx_hsta_msi.irq_count = irq_count; return 0; free_irq_map: kfree(ppc4xx_hsta_msi.irq_map);
--
2.9.3