diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-01-10 02:27:36 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-09 18:26:48 -0500 |
commit | 00ffc13f35f1a5b2d8dc9f2dd2f410f017330a97 (patch) | |
tree | bb75faabea05b6a2d4037396ffadd7a8cae1eab4 /drivers/spi | |
parent | e290cf276bc2a6cdcb360fd72b7a6a24539505fc (diff) |
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>
Diffstat (limited to 'drivers/spi')
-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) | |||
793 | 793 | ||
794 | ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME); | 794 | ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME); |
795 | if (ret) { | 795 | if (ret) { |
796 | while (i > 0) { | ||
797 | i--; | ||
798 | if (spi_imx->chipselect[i] >= 0) | ||
799 | gpio_free(spi_imx->chipselect[i]); | ||
800 | } | ||
801 | dev_err(&pdev->dev, "can't get cs gpios\n"); | 796 | dev_err(&pdev->dev, "can't get cs gpios\n"); |
802 | goto out_master_put; | 797 | goto out_gpio_free; |
803 | } | 798 | } |
804 | } | 799 | } |
805 | 800 | ||
@@ -881,10 +876,10 @@ out_iounmap: | |||
881 | out_release_mem: | 876 | out_release_mem: |
882 | release_mem_region(res->start, resource_size(res)); | 877 | release_mem_region(res->start, resource_size(res)); |
883 | out_gpio_free: | 878 | out_gpio_free: |
884 | for (i = 0; i < master->num_chipselect; i++) | 879 | while (--i >= 0) { |
885 | if (spi_imx->chipselect[i] >= 0) | 880 | if (spi_imx->chipselect[i] >= 0) |
886 | gpio_free(spi_imx->chipselect[i]); | 881 | gpio_free(spi_imx->chipselect[i]); |
887 | out_master_put: | 882 | } |
888 | spi_master_put(master); | 883 | spi_master_put(master); |
889 | kfree(master); | 884 | kfree(master); |
890 | platform_set_drvdata(pdev, NULL); | 885 | platform_set_drvdata(pdev, NULL); |