diff options
| author | John Ogness <john.ogness@linutronix.de> | 2009-11-24 17:53:07 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-09 02:48:16 +0100 |
| commit | bbd050af0e2b7d77bfc959cf76219eb71c3b982a (patch) | |
| tree | 9a4da1f3a330ecdc5c6bbba7494940d74376ce79 /drivers | |
| parent | spi/i.mx: drain MXC SPI transfer buffer when probing device (diff) | |
| download | linux-bbd050af0e2b7d77bfc959cf76219eb71c3b982a.tar.xz linux-bbd050af0e2b7d77bfc959cf76219eb71c3b982a.zip | |
spi/i.MX: fix broken error handling for gpio_request
i.MX35-provided chipselects are represented using negative numbers. If
gpio_request() fails and the previous chipselect was a negative number,
the while loop is endless (i is never decremented).
Also, the error loop would never call gpio_free on chipselect[0].
And finally, the error message was missing an endline.
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi_imx.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 1b17f443dee7..8ffa48ce570c 100644 --- a/drivers/spi/spi_imx.c +++ b/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; } } |