diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-01-10 15:27:36 +0800 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-09 16:26:48 -0700 |
| commit | 00ffc13f35f1a5b2d8dc9f2dd2f410f017330a97 (patch) | |
| tree | bb75faabea05b6a2d4037396ffadd7a8cae1eab4 | |
| parent | e290cf276bc2a6cdcb360fd72b7a6a24539505fc (diff) | |
| download | blackbird-obmc-linux-00ffc13f35f1a5b2d8dc9f2dd2f410f017330a97.tar.gz blackbird-obmc-linux-00ffc13f35f1a5b2d8dc9f2dd2f410f017330a97.zip | |
spi/imx: simplify error handling to free gpios
Simplify the error handling by moving the code to free gpios in one place.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | drivers/spi/spi-imx.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index c6e697f5e007..31054e3de4c1 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -793,13 +793,8 @@ static int __devinit spi_imx_probe(struct platform_device *pdev) ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME); if (ret) { - 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\n"); - goto out_master_put; + goto out_gpio_free; } } @@ -881,10 +876,10 @@ out_iounmap: out_release_mem: release_mem_region(res->start, resource_size(res)); out_gpio_free: - for (i = 0; i < master->num_chipselect; i++) + while (--i >= 0) { if (spi_imx->chipselect[i] >= 0) gpio_free(spi_imx->chipselect[i]); -out_master_put: + } spi_master_put(master); kfree(master); platform_set_drvdata(pdev, NULL); |
