[PATCH 2/4] spi: imx: Fix failure path leak on GPIO request error

[Oleksij Rempel]

On Fri, Oct 13, 2017 at 12:54:08PM -0700, Trent Piepho wrote:
> If the code that requests any chip select GPIOs fails, the cleanup of
> spi_bitbang_start() by calling spi_bitbang_stop() is not done.
> 
> Fix this by moving spi_bitbang_start() to after the code that requets
> GPIOs.  The GPIOs are dev managed and don't need explicit cleanup.
> Since spi_bitbang_start() is now the last operation, it doesn't need
> to be cleaned up in the failure path.
> 
> Signed-off-by: Trent Piepho <tpiepho at impinj.com>
> ---
>  drivers/spi/spi-imx.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
> index 07e6250f2dad..fea46cbf458a 100644
> --- a/drivers/spi/spi-imx.c
> +++ b/drivers/spi/spi-imx.c
> @@ -1451,11 +1451,6 @@ static int spi_imx_probe(struct platform_device *pdev)
>  	spi_imx->devtype_data->intctrl(spi_imx, 0);
>  
>  	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;
> -	}
>  
>  	/* Request GPIO CS lines, if any */
>  	if (master->cs_gpios) {
> @@ -1473,6 +1468,12 @@ static int spi_imx_probe(struct platform_device *pdev)
>  		}
>  	}
>  
> +	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");
>  
>  	clk_disable(spi_imx->clk_ipg);
> -- 
> 2.13.6

Reviewed-by: Oleksij Rempel <o.rempel at pengutronix.de>

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |