Commit 3bf3eb2b authored Sep 16, 2016 by Wei Yongjun Committed by Mark Brown Sep 16, 2016

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: fa236a7e ("spi: bcm-qspi: Add Broadcom MSPI driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent a0319f8b

drivers/spi/spi-bcm-qspi.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1174,8 +1174,8 @@ int bcm_qspi_probe(struct platform_device *pdev,

	qspi->dev_ids = kcalloc(num_irqs, sizeof(struct bcm_qspi_dev_id),		qspi->dev_ids = kcalloc(num_irqs, sizeof(struct bcm_qspi_dev_id),
	GFP_KERNEL);		GFP_KERNEL);
	if (IS_ERR(qspi->dev_ids)) {		if (!qspi->dev_ids) {
	ret = PTR_ERR(qspi->dev_ids);		ret = -ENOMEM;
	goto qspi_probe_err;		goto qspi_probe_err;
	}		}