Merge tag 'ntb-5.11' of git://github.com/jonmason/ntb

[linux-2.6-microblaze.git] / drivers / ntb / hw / idt / ntb_hw_idt.c

diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index d54261f..e7a4c2a 100644 (file)
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2511,7 +2511,7 @@ static int idt_init_dbgfs(struct idt_ntb_dev *ndev)
        /* If the top directory is not created then do nothing */
        if (IS_ERR_OR_NULL(dbgfs_topdir)) {
                dev_info(&ndev->ntb.pdev->dev, "Top DebugFS directory absent");
-               return PTR_ERR(dbgfs_topdir);
+               return PTR_ERR_OR_ZERO(dbgfs_topdir);
        }
 
        /* Create the info file node */
@@ -2756,7 +2756,7 @@ static int idt_pci_probe(struct pci_dev *pdev,
 
        /* Allocate the memory for IDT NTB device data */
        ndev = idt_create_dev(pdev, id);
-       if (IS_ERR_OR_NULL(ndev))
+       if (IS_ERR(ndev))
                return PTR_ERR(ndev);
 
        /* Initialize the basic PCI subsystem of the device */