From c06b121736a4f98fe5ded869db1906acde812ceb Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Mon, 16 Apr 2012 11:32:17 -0700
Subject: [PATCH] --- yaml --- r: 302623 b: refs/heads/master c:
 da4964387d997244b043dd812540bed851c45c9e h: refs/heads/master i:   302621:
 acb707ccca9da4122467195e56e9ae87a0a1b095   302619:
 bc347c62ffb9c633be0acf7c3f0ff888693370b6   302615:
 627db3f7a3e2df9e48aa7de7ec10e72a020a752a   302607:
 7dda4afc6a4c7ef66eff6053d2b7729de7d9ae14   302591:
 db5811eafef9bd2b38c4b7e71b1ad6ba4d3d3404 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/infiniband/hw/ocrdma/ocrdma_hw.c    | 2 +-
 trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index de4c3274de29..c0d170011875 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe2caefcdf5869f308c102e3d64d40683bfad711
+refs/heads/master: da4964387d997244b043dd812540bed851c45c9e
diff --git a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index c53545f1baf6..025c4a9a3d5b 100644
--- a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -2546,7 +2546,7 @@ static int ocrdma_create_mq_eq(struct ocrdma_dev *dev)
 
 static int ocrdma_create_qp_eqs(struct ocrdma_dev *dev)
 {
-	int num_eq, i, status;
+	int num_eq, i, status = 0;
 	int irq;
 	unsigned long flags = 0;
 
diff --git a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 51fc9c7c0acf..e955f1f0848d 100644
--- a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -334,7 +334,7 @@ static int ocrdma_copy_pd_uresp(struct ocrdma_pd *pd,
 {
 	int status;
 	u64 db_page_addr;
-	u64 dpp_page_addr;
+	u64 dpp_page_addr = 0;
 	u32 db_page_size;
 	struct ocrdma_alloc_pd_uresp rsp;
 	struct ocrdma_ucontext *uctx = get_ocrdma_ucontext(ib_ctx);
@@ -368,7 +368,8 @@ static int ocrdma_copy_pd_uresp(struct ocrdma_pd *pd,
 	return 0;
 
 ucopy_err:
-	ocrdma_del_mmap(pd->uctx, dpp_page_addr, OCRDMA_DPP_PAGE_SIZE);
+	if (pd->dpp_enabled)
+		ocrdma_del_mmap(pd->uctx, dpp_page_addr, OCRDMA_DPP_PAGE_SIZE);
 dpp_map_err:
 	ocrdma_del_mmap(pd->uctx, db_page_addr, db_page_size);
 	return status;