hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: bf2a952d31 ("NTB: Add IDT 89HPESxNTx PCIe-switches support")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Gustavo A. R. Silva 2018-08-27 17:13:06 -05:00 committed by Jon Mason
parent 7756e2b5d6
commit 1b7619828d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ntb/hw/idt/ntb_hw_idt.c
View File

@ -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 */ /* Allocate memory for memory window descriptors */
ret_mws = devm_kcalloc(&ndev->ntb.pdev->dev, *mw_cnt, ret_mws = devm_kcalloc(&ndev->ntb.pdev->dev, *mw_cnt, sizeof(*ret_mws),
sizeof(*ret_mws), GFP_KERNEL); GFP_KERNEL);
if (IS_ERR_OR_NULL(ret_mws)) if (!ret_mws)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
/* Copy the info of detected memory windows */ /* 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 */ /* Allocate memory for the IDT PCIe-device descriptor */
ndev = devm_kzalloc(&pdev->dev, sizeof(*ndev), GFP_KERNEL); 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"); dev_err(&pdev->dev, "Memory allocation failed for descriptor");
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }