diff options
| author | Fabio Estevam <fabio.estevam@nxp.com> | 2017-06-20 18:50:55 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-06-21 13:09:07 +0200 |
| commit | 2c147776dc8b3d67ec42605dcba4deb98f2d0536 (patch) | |
| tree | 3021356e8bc941aa7a279ac6f7554420ee08abbf /drivers/spi | |
| parent | spi: imx: rename 'bpw' variables (diff) | |
| download | linux-2c147776dc8b3d67ec42605dcba4deb98f2d0536.tar.xz linux-2c147776dc8b3d67ec42605dcba4deb98f2d0536.zip | |
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>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-imx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index e544f45348cc..f9698b7aeb3b 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -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); |