Merge branch 'for-4.2-misc' into k.o/for-4.2 (0699ee7a) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/infiniband/hw/mthca/mthca_profile.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -77,7 +77,6 @@ s64 mthca_make_profile(struct mthca_dev *dev,
		u64 mem_base, mem_avail;
		s64 total_size = 0;
		struct mthca_resource *profile;
		struct mthca_resource tmp;
		int i, j;

		profile = kzalloc(MTHCA_RES_NUM * sizeof *profile, GFP_KERNEL);
		@@ -136,11 +135,8 @@ s64 mthca_make_profile(struct mthca_dev *dev,
		*/
		for (i = MTHCA_RES_NUM; i > 0; --i)
		for (j = 1; j < i; ++j) {
		if (profile[j].size > profile[j - 1].size) {
		tmp = profile[j];
		profile[j] = profile[j - 1];
		profile[j - 1] = tmp;
		}
		if (profile[j].size > profile[j - 1].size)
		swap(profile[j], profile[j - 1]);
		}

		for (i = 0; i < MTHCA_RES_NUM; ++i) {

+0 −1

Original line number	Diff line number	Diff line
		@@ -684,7 +684,6 @@ struct ib_pd ocrdma_alloc_pd(struct ib_device ibdev,
		ocrdma_release_ucontext_pd(uctx);
		} else {
		status = _ocrdma_dealloc_pd(dev, pd);
		kfree(pd);
		}
		exit:
		return ERR_PTR(status);

+3 −4

Original line number	Diff line number	Diff line
		@@ -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);