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

Commit 2c147776 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

spi: imx: Check for allocation failure earlier 



In case of spi_alloc_master() failure it is better to return the
error immediately, so move the error check right after the allocation.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2e312f6c

drivers/spi/spi-imx.c

+3 −3
Original line number Diff line number Diff line
@@ -1169,15 +1169,15 @@ static int spi_imx_probe(struct platform_device *pdev) 
	}



	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_imx_data));

	if (!master)

		return -ENOMEM;



	ret = of_property_read_u32(np, "fsl,spi-rdy-drctl", &spi_drctl);

	if ((ret < 0) || (spi_drctl >= 0x3)) {

		/* '11' is reserved */

		spi_drctl = 0;

	}



	if (!master)

		return -ENOMEM;



	platform_set_drvdata(pdev, master);



	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);