diff options
| author |   Insu Yun <wuninsu@gmail.com> | 2015-10-15 21:15:15 +0000 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2015-10-21 16:41:19 -0400 |
| commit | 2c79dad8953626b8b808a353bc661c9f321a64c0 (patch) | |
| tree | 814f22590750e094867201bfc9a9849c5fdf0c30 /drivers/infiniband/hw/usnic/usnic_ib_main.c | |
| parent | Merge branch 'k.o/for-4.3-v1' into k.o/for-4.4 (diff) | |
| download | linux-dev-2c79dad8953626b8b808a353bc661c9f321a64c0.tar.xz linux-dev-2c79dad8953626b8b808a353bc661c9f321a64c0.zip | |
usnic: correctly check failed allocation
Since ib_alloc_device returns allocated memory address, not error,
it should be checked as IS_NULL, not IS_ERR_OR_NULL.
Signed-off-by: Insu Yun <wuninsu@gmail.com>
Reviewed-by: Dave Goodell <dgoodell@cisco.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/usnic/usnic_ib_main.c')
| -rw-r--r-- | drivers/infiniband/hw/usnic/usnic_ib_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c index 0c15bd885035..565c881a44ba 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c @@ -343,16 +343,15 @@ static void *usnic_ib_device_add(struct pci_dev *dev) netdev = pci_get_drvdata(dev); us_ibdev = (struct usnic_ib_dev *)ib_alloc_device(sizeof(*us_ibdev)); - if (IS_ERR_OR_NULL(us_ibdev)) { + if (!us_ibdev) { usnic_err("Device %s context alloc failed\n", netdev_name(pci_get_drvdata(dev))); - return ERR_PTR(us_ibdev ? PTR_ERR(us_ibdev) : -EFAULT); + return ERR_PTR(-EFAULT); } us_ibdev->ufdev = usnic_fwd_dev_alloc(dev); - if (IS_ERR_OR_NULL(us_ibdev->ufdev)) { - usnic_err("Failed to alloc ufdev for %s with err %ld\n", - pci_name(dev), PTR_ERR(us_ibdev->ufdev)); + if (!us_ibdev->ufdev) { + usnic_err("Failed to alloc ufdev for %s\n", pci_name(dev)); goto err_dealloc; } |