Skip to content

Commit

Permalink
spi: bcm-qspi: Fix return value check in bcm_qspi_probe()
Browse files Browse the repository at this point in the history
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: fa236a7 ("spi: bcm-qspi: Add Broadcom MSPI driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Wei Yongjun authored and Mark Brown committed Sep 16, 2016
1 parent a0319f8 commit 3bf3eb2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/spi/spi-bcm-qspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 3bf3eb2

Please sign in to comment.