diff options
| author |   Doug Ledford <dledford@redhat.com> | 2015-06-11 01:13:30 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-06-11 01:13:30 -0400 |
| commit | 0699ee7ad7da8bde59d9cf13a50da95e1931e61d (patch) | |
| tree | 2df54fc0d365b0645c4072360b610885351e16ef /drivers/infiniband/hw/usnic | |
| parent | IB/core: Don't warn on no SA support in event handler (diff) | |
| parent | RDMA/ocrdma: fix double free on pd (diff) | |
| download | linux-dev-0699ee7ad7da8bde59d9cf13a50da95e1931e61d.tar.xz linux-dev-0699ee7ad7da8bde59d9cf13a50da95e1931e61d.zip | |
Merge branch 'for-4.2-misc' into k.o/for-4.2
Diffstat (limited to 'drivers/infiniband/hw/usnic')
| -rw-r--r-- | drivers/infiniband/hw/usnic/usnic_uiom.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index 417de1f32960..cb2337f0532b 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -472,11 +472,10 @@ struct usnic_uiom_pd *usnic_uiom_alloc_pd(void) return ERR_PTR(-ENOMEM); pd->domain = domain = iommu_domain_alloc(&pci_bus_type); - if (IS_ERR_OR_NULL(domain)) { - usnic_err("Failed to allocate IOMMU domain with err %ld\n", - PTR_ERR(pd->domain)); + if (!domain) { + usnic_err("Failed to allocate IOMMU domain"); kfree(pd); - return ERR_PTR(domain ? PTR_ERR(domain) : -ENOMEM); + return ERR_PTR(-ENOMEM); } iommu_set_fault_handler(pd->domain, usnic_uiom_dma_fault, NULL); |