diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-21 07:12:02 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-23 13:38:46 +0400 |
| commit | 543c954d6807ad0682c37846b7b9c423cd941415 (patch) | |
| tree | 93347a9cead9cc5d8044ee79d70244693701961c | |
| parent | 31407478a7b56187f9912eb6882a3c623365319f (diff) | |
| download | linux-543c954d6807ad0682c37846b7b9c423cd941415.tar.xz | |
spi: atmel: fix return value check in atmel_spi_probe()
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should be
replaced with IS_ERR().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/spi/spi-atmel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 118a938776bd..273db0beb2b8 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1547,8 +1547,10 @@ static int atmel_spi_probe(struct platform_device *pdev) as->pdev = pdev; as->regs = devm_ioremap_resource(&pdev->dev, regs); - if (!as->regs) + if (IS_ERR(as->regs)) { + ret = PTR_ERR(as->regs); goto out_free_buffer; + } as->phybase = regs->start; as->irq = irq; as->clk = clk; |