Skip to content

Commit 48e5aa2

Browse files
Yue Haibinggregkh
authored andcommitted
RDMA/usnic: Fix passing zero to PTR_ERR in usnic_ib_pci_probe()
[ Upstream commit 95ba385 ] drivers/infiniband/hw/usnic/usnic_ib_main.c:590 usnic_ib_pci_probe() warn: passing zero to 'PTR_ERR' Make usnic_ib_device_add() return NULL on fail path, also remove useless NULL check for usnic_ib_discover_pf() Fixes: e3cf00d ("IB/usnic: Add Cisco VIC low-level hardware driver") Link: https://patch.msgid.link/r/20250324123132.2392077-1-yuehaibing@huawei.com Signed-off-by: Yue Haibing <yuehaibing@huawei.com> Reviewed-by: Zhu Yanjun <yanjun.zhu@linux.dev> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 6104cc6 commit 48e5aa2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/infiniband/hw/usnic/usnic_ib_main.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
380380
if (!us_ibdev) {
381381
usnic_err("Device %s context alloc failed\n",
382382
netdev_name(pci_get_drvdata(dev)));
383-
return ERR_PTR(-EFAULT);
383+
return NULL;
384384
}
385385

386386
us_ibdev->ufdev = usnic_fwd_dev_alloc(dev);
@@ -500,8 +500,8 @@ static struct usnic_ib_dev *usnic_ib_discover_pf(struct usnic_vnic *vnic)
500500
}
501501

502502
us_ibdev = usnic_ib_device_add(parent_pci);
503-
if (IS_ERR_OR_NULL(us_ibdev)) {
504-
us_ibdev = us_ibdev ? us_ibdev : ERR_PTR(-EFAULT);
503+
if (!us_ibdev) {
504+
us_ibdev = ERR_PTR(-EFAULT);
505505
goto out;
506506
}
507507

@@ -569,10 +569,10 @@ static int usnic_ib_pci_probe(struct pci_dev *pdev,
569569
}
570570

571571
pf = usnic_ib_discover_pf(vf->vnic);
572-
if (IS_ERR_OR_NULL(pf)) {
573-
usnic_err("Failed to discover pf of vnic %s with err%ld\n",
574-
pci_name(pdev), PTR_ERR(pf));
575-
err = pf ? PTR_ERR(pf) : -EFAULT;
572+
if (IS_ERR(pf)) {
573+
err = PTR_ERR(pf);
574+
usnic_err("Failed to discover pf of vnic %s with err%d\n",
575+
pci_name(pdev), err);
576576
goto out_clean_vnic;
577577
}
578578

0 commit comments

Comments
 (0)