diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-04 16:32:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-04 16:32:51 +0100 |
| commit | 14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2 (patch) | |
| tree | f79fb71b6206ef40aa34c52649053a2aaa493a3c /drivers/spi/spi-bcm2835aux.c | |
| parent | Merge branch 'spi-5.0' into spi-linus (diff) | |
| parent | spi: sh-msiof: Restrict bits per word to 8/16/24/32 on R-Car Gen2/3 (diff) | |
| download | linux-14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2.tar.xz linux-14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2.zip | |
Merge branch 'spi-5.1' into spi-next
Diffstat (limited to 'drivers/spi/spi-bcm2835aux.c')
| -rw-r--r-- | drivers/spi/spi-bcm2835aux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c index 671e374e1b01..f7e054848ca5 100644 --- a/drivers/spi/spi-bcm2835aux.c +++ b/drivers/spi/spi-bcm2835aux.c @@ -456,7 +456,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) } bs->clk = devm_clk_get(&pdev->dev, NULL); - if ((!bs->clk) || (IS_ERR(bs->clk))) { + if (IS_ERR(bs->clk)) { err = PTR_ERR(bs->clk); dev_err(&pdev->dev, "could not get clk: %d\n", err); goto out_master_put; |