From c75f8bc37270adf41b7bfed746d0044ac42c4cae Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 7 Mar 2011 13:56:11 +0800 Subject: [PATCH] --- yaml --- r: 243476 b: refs/heads/master c: 5898eb79fb45d4fd4ce22139c168de937bfaab38 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/am300epd.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fe20c618a256..05487fdc396e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8aad172e6c54c74b1effe88ded2f308db3e1b658 +refs/heads/master: 5898eb79fb45d4fd4ce22139c168de937bfaab38 diff --git a/trunk/arch/arm/mach-pxa/am300epd.c b/trunk/arch/arm/mach-pxa/am300epd.c index 993d75e66390..fa8bad235d9f 100644 --- a/trunk/arch/arm/mach-pxa/am300epd.c +++ b/trunk/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; }