From 5898eb79fb45d4fd4ce22139c168de937bfaab38 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 7 Mar 2011 13:56:11 +0800 Subject: ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path If gpio_request fails when i > 0, gpios[0] is not freed in current implementation. Signed-off-by: Axel Lin Signed-off-by: Eric Miao --- arch/arm/mach-pxa/am300epd.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'arch/arm/mach-pxa/am300epd.c') diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c index 993d75e66390..fa8bad235d9f 100644 --- a/arch/arm/mach-pxa/am300epd.c +++ b/arch/arm/mach-pxa/am300epd.c @@ -125,10 +125,7 @@ static int am300_init_gpio_regs(struct broadsheetfb_par *par) if (err) { dev_err(&am300_device->dev, "failed requesting " "gpio %d, err=%d\n", i, err); - while (i >= DB0_GPIO_PIN) - gpio_free(i--); - i = ARRAY_SIZE(gpios) - 1; - goto err_req_gpio; + goto err_req_gpio2; } } @@ -159,9 +156,13 @@ static int am300_init_gpio_regs(struct broadsheetfb_par *par) return 0; +err_req_gpio2: + while (--i >= DB0_GPIO_PIN) + gpio_free(i); + i = ARRAY_SIZE(gpios); err_req_gpio: - while (i > 0) - gpio_free(gpios[i--]); + while (--i >= 0) + gpio_free(gpios[i]); return err; } -- cgit v1.2.2