Skip to contentSkip to conversation

SPI/i.MX: fix broken error handling for gpio_request

PATCH New John Ogness 1 participant 1 message Nov 24, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

This patch is against 2.6.32-rc8.

---
 spi_imx.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/spi/spi_imx.c +5 -4
@@ -513,11 +513,12 @@ static int __init spi_imx_probe(struct p
 			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;
 		}
 	}