Commit 8197f489 authored by Trent Piepho's avatar Trent Piepho Committed by Mark Brown

spi: imx: Fix failure path leak on GPIO request error correctly

In commit 974488e4 ("spi: imx: Fix failure path leak on GPIO request
error"), spi_bitbang_start() was moved later in the probe sequence.  But
this doesn't work, as spi_bitbang_start() has to be called before
requesting GPIOs because the GPIO data in the spi master is populated when
the master is registed, and that doesn't happen until spi_bitbang_start()
is called.  The default only works if one uses one CS.

So add a failure path call to spi_bitbang_stop() to fix the leak.

CC: Shawn Guo <shawnguo@kernel.org>
CC: Sascha Hauer <kernel@pengutronix.de>
CC: Fabio Estevam <fabio.estevam@nxp.com>
CC: Mark Brown <broonie@kernel.org>
CC: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarTrent Piepho <tpiepho@impinj.com>
Reviewed-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 974488e4
...@@ -1613,6 +1613,11 @@ static int spi_imx_probe(struct platform_device *pdev) ...@@ -1613,6 +1613,11 @@ static int spi_imx_probe(struct platform_device *pdev)
spi_imx->devtype_data->intctrl(spi_imx, 0); spi_imx->devtype_data->intctrl(spi_imx, 0);
master->dev.of_node = pdev->dev.of_node; master->dev.of_node = pdev->dev.of_node;
ret = spi_bitbang_start(&spi_imx->bitbang);
if (ret) {
dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
goto out_clk_put;
}
if (!spi_imx->slave_mode) { if (!spi_imx->slave_mode) {
if (!master->cs_gpios) { if (!master->cs_gpios) {
...@@ -1631,23 +1636,19 @@ static int spi_imx_probe(struct platform_device *pdev) ...@@ -1631,23 +1636,19 @@ static int spi_imx_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, "Can't get CS GPIO %i\n", dev_err(&pdev->dev, "Can't get CS GPIO %i\n",
master->cs_gpios[i]); master->cs_gpios[i]);
goto out_clk_put; goto out_spi_bitbang;
} }
} }
} }
ret = spi_bitbang_start(&spi_imx->bitbang);
if (ret) {
dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
goto out_clk_put;
}
dev_info(&pdev->dev, "probed\n"); dev_info(&pdev->dev, "probed\n");
clk_disable(spi_imx->clk_ipg); clk_disable(spi_imx->clk_ipg);
clk_disable(spi_imx->clk_per); clk_disable(spi_imx->clk_per);
return ret; return ret;
out_spi_bitbang:
spi_bitbang_stop(&spi_imx->bitbang);
out_clk_put: out_clk_put:
clk_disable_unprepare(spi_imx->clk_ipg); clk_disable_unprepare(spi_imx->clk_ipg);
out_put_per: out_put_per:
......
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