|
@@ -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);
|
|
|
}
|