mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
spi: imx: Fix failure path leak on GPIO request error
If the code that requests any chip select GPIOs fails, the cleanup of spi_bitbang_start() by calling spi_bitbang_stop() is not done. Add this to the failure path. Note that 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. CC: Shawn Guo <[email protected]> CC: Sascha Hauer <[email protected]> CC: Fabio Estevam <[email protected]> CC: Mark Brown <[email protected]> CC: Oleksij Rempel <[email protected]> Signed-off-by: Trent Piepho <[email protected]> Signed-off-by: Mark Brown <[email protected]>
This commit is contained in:
parent
881a0b993e
commit
4e21791e74
1 changed files with 3 additions and 1 deletions
|
|
@ -1633,7 +1633,7 @@ static int spi_imx_probe(struct platform_device *pdev)
|
|||
if (ret) {
|
||||
dev_err(&pdev->dev, "Can't get CS GPIO %i\n",
|
||||
master->cs_gpios[i]);
|
||||
goto out_clk_put;
|
||||
goto out_spi_bitbang;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1650,6 +1650,8 @@ static int spi_imx_probe(struct platform_device *pdev)
|
|||
clk_disable(spi_imx->clk_per);
|
||||
return ret;
|
||||
|
||||
out_spi_bitbang:
|
||||
spi_bitbang_stop(&spi_imx->bitbang);
|
||||
out_clk_put:
|
||||
clk_disable_unprepare(spi_imx->clk_ipg);
|
||||
out_put_per:
|
||||
|
|
|
|||
Loading…
Reference in a new issue