Re: [PATCH] spi: imx: Fix failure path leak on GPIO request error correctly

[Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>]

On 06.11.2017 19:38, Trent Piepho wrote:
> In commit 974488e4ce1e ("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@xxxxxxxxxx>
> CC: Sascha Hauer <kernel@xxxxxxxxxxxxxx>
> CC: Fabio Estevam <fabio.estevam@xxxxxxx>
> CC: Mark Brown <broonie@xxxxxxxxxx>
> CC: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
> Signed-off-by: Trent Piepho <tpiepho@xxxxxxxxxx>

Reviewed-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>

> ---
>  drivers/spi/spi-imx.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
> index 5ddd32ba2521..301cdb721bad 100644
> --- a/drivers/spi/spi-imx.c
> +++ b/drivers/spi/spi-imx.c
> @@ -1613,6 +1613,11 @@ 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;
> +	}
>  
>  	if (!spi_imx->slave_mode) {
>  		if (!master->cs_gpios) {
> @@ -1631,23 +1636,19 @@ 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;
>  			}
>  		}
>  	}
>  
> -	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);
>  	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:
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html