Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/spi/spi_imx.c

+5 −4
Original line number Diff line number Diff line
@@ -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) {

			while (i > 0) {

				i--;

			while (i > 0)

				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;

		}

	}