diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2016-09-16 13:45:17 +0000 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-09-16 17:23:11 +0100 |
| commit | 3bf3eb2b95aaf18eff3080444b24673cda8ff9a2 (patch) | |
| tree | c6add130466004f3d51927b01799b85501fe2217 /drivers/spi/spi-bcm-qspi.c | |
| parent | spi: bcm-qspi: fix suspend/resume #ifdef (diff) | |
| download | linux-dev-3bf3eb2b95aaf18eff3080444b24673cda8ff9a2.tar.xz linux-dev-3bf3eb2b95aaf18eff3080444b24673cda8ff9a2.zip | |
spi: bcm-qspi: Fix return value check in bcm_qspi_probe()
In case of error, the function kcalloc() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.
Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-bcm-qspi.c')
| -rw-r--r-- | drivers/spi/spi-bcm-qspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c index 64e693de1486..2caeea75a752 100644 --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c @@ -1174,8 +1174,8 @@ int bcm_qspi_probe(struct platform_device *pdev, qspi->dev_ids = kcalloc(num_irqs, sizeof(struct bcm_qspi_dev_id), GFP_KERNEL); - if (IS_ERR(qspi->dev_ids)) { - ret = PTR_ERR(qspi->dev_ids); + if (!qspi->dev_ids) { + ret = -ENOMEM; goto qspi_probe_err; } |