These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / infiniband / hw / usnic / usnic_uiom.c

diff --git a/kernel/drivers/infiniband/hw/usnic/usnic_uiom.c b/kernel/drivers/infiniband/hw/usnic/usnic_uiom.c
index 417de1f..645a5f6 100644 (file)
--- a/kernel/drivers/infiniband/hw/usnic/usnic_uiom.c
+++ b/kernel/drivers/infiniband/hw/usnic/usnic_uiom.c
@@ -7,7 +7,7 @@
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
+ * BSD license below:
  *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
@@ -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);