diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-04 17:35:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 17:35:07 +0100 |
| commit | 106dbe24d4146c0804cb025e450ac7af42d72356 (patch) | |
| tree | ad196f245894a8546603f8472619f9e5b73b8265 /drivers/spi/spi-bcm2835aux.c | |
| parent | 2337ff45293f36efa79247b3680223b9c9154392 (diff) | |
| parent | 8cc7720470a17558bd6f8d67df63361600e46c55 (diff) | |
| download | talos-op-linux-106dbe24d4146c0804cb025e450ac7af42d72356.tar.gz talos-op-linux-106dbe24d4146c0804cb025e450ac7af42d72356.zip | |
Merge branch 'spi-5.3' into spi-next
Diffstat (limited to 'drivers/spi/spi-bcm2835aux.c')
| -rw-r--r-- | drivers/spi/spi-bcm2835aux.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c index 40dfb7f58efe..bb57035c5770 100644 --- a/drivers/spi/spi-bcm2835aux.c +++ b/drivers/spi/spi-bcm2835aux.c @@ -496,10 +496,8 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) int err; master = spi_alloc_master(&pdev->dev, sizeof(*bs)); - if (!master) { - dev_err(&pdev->dev, "spi_alloc_master() failed\n"); + if (!master) return -ENOMEM; - } platform_set_drvdata(pdev, master); master->mode_bits = (SPI_CPOL | SPI_CS_HIGH | SPI_NO_CS); |
