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;
                 }
         }