Commit bbd050af authored by John Ogness's avatar John Ogness Committed by Grant Likely

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: default avatarJohn Ogness <john.ogness@linutronix.de>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent ce1807b2
...@@ -516,11 +516,12 @@ static int __init spi_imx_probe(struct platform_device *pdev) ...@@ -516,11 +516,12 @@ static int __init spi_imx_probe(struct platform_device *pdev)
continue; continue;
ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME); ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME);
if (ret) { if (ret) {
i--; while (i > 0) {
while (i > 0) i--;
if (spi_imx->chipselect[i] >= 0) if (spi_imx->chipselect[i] >= 0)
gpio_free(spi_imx->chipselect[i--]); gpio_free(spi_imx->chipselect[i]);
dev_err(&pdev->dev, "can't get cs gpios"); }
dev_err(&pdev->dev, "can't get cs gpios\n");
goto out_master_put; goto out_master_put;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment