From 81decfb9c94ac5a80547af4c9a84879001ad8663 Mon Sep 17 00:00:00 2001 From: John Ogness Date: Tue, 24 Nov 2009 16:53:07 +0000 Subject: [PATCH] --- yaml --- r: 176179 b: refs/heads/master c: bbd050af0e2b7d77bfc959cf76219eb71c3b982a h: refs/heads/master i: 176177: 2f18357961aca2b3756bc381ea1fce0c33973c36 176175: d64291603bfa0e0969963e93817c0e4508f069ed v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_imx.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8c87dd375232..41974766f35e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce1807b2e527979bd77d8a1a1768a6365f3febb5 +refs/heads/master: bbd050af0e2b7d77bfc959cf76219eb71c3b982a diff --git a/trunk/drivers/spi/spi_imx.c b/trunk/drivers/spi/spi_imx.c index 1b17f443dee7..8ffa48ce570c 100644 --- a/trunk/drivers/spi/spi_imx.c +++ b/trunk/drivers/spi/spi_imx.c @@ -516,11 +516,12 @@ static int __init spi_imx_probe(struct platform_device *pdev) continue; ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME); if (ret) { - i--; - while (i > 0) + while (i > 0) { + i--; if (spi_imx->chipselect[i] >= 0) - gpio_free(spi_imx->chipselect[i--]); - dev_err(&pdev->dev, "can't get cs gpios"); + gpio_free(spi_imx->chipselect[i]); + } + dev_err(&pdev->dev, "can't get cs gpios\n"); goto out_master_put; } }