mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
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: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
2e312f6cdb
commit
2c147776dc
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user