Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b761982 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Jon Mason
Browse files

NTB: ntb_hw_idt: replace IS_ERR_OR_NULL with regular NULL checks 



Both devm_kcalloc() and devm_kzalloc() return NULL on error. They
never return error pointers.

The use of IS_ERR_OR_NULL is currently applied to the wrong
context.

Fix this by replacing IS_ERR_OR_NULL with regular NULL checks.

Fixes: bf2a952d ("NTB: Add IDT 89HPESxNTx PCIe-switches support")
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent 7756e2b5

drivers/ntb/hw/idt/ntb_hw_idt.c

+4 −4
Original line number Diff line number Diff line
@@ -1105,9 +1105,9 @@ static struct idt_mw_cfg *idt_scan_mws(struct idt_ntb_dev *ndev, int port, 
	}



	/* Allocate memory for memory window descriptors */

	ret_mws = devm_kcalloc(&ndev->ntb.pdev->dev, *mw_cnt,

				sizeof(*ret_mws), GFP_KERNEL);

	if (IS_ERR_OR_NULL(ret_mws))

	ret_mws = devm_kcalloc(&ndev->ntb.pdev->dev, *mw_cnt, sizeof(*ret_mws),

			       GFP_KERNEL);

	if (!ret_mws)

		return ERR_PTR(-ENOMEM);



	/* Copy the info of detected memory windows */
@@ -2390,7 +2390,7 @@ static struct idt_ntb_dev *idt_create_dev(struct pci_dev *pdev, 


	/* Allocate memory for the IDT PCIe-device descriptor */

	ndev = devm_kzalloc(&pdev->dev, sizeof(*ndev), GFP_KERNEL);

	if (IS_ERR_OR_NULL(ndev)) {

	if (!ndev) {

		dev_err(&pdev->dev, "Memory allocation failed for descriptor");

		return ERR_PTR(-ENOMEM);

	}