1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/staging/rdma/ehca/ehca_mrmw.c b/drivers/staging/rdma/ehca/ehca_mrmw.c
index f914b30999f8..4d52ca42644a 100644
--- a/drivers/staging/rdma/ehca/ehca_mrmw.c
+++ b/drivers/staging/rdma/ehca/ehca_mrmw.c
@@ -1921,7 +1921,7 @@ static int ehca_set_pagebuf_user2(struct ehca_mr_pginfo *pginfo,
                                   u64 *kpage)
 {
         int ret = 0;
-        u64 pgaddr, prev_pgaddr;
+        u64 pgaddr, prev_pgaddr = 0;
         u32 j = 0;
         int kpages_per_hwpage = pginfo->hwpage_size / PAGE_SIZE;
         int nr_kpages = kpages_per_hwpage;
@@ -2417,6 +2417,7 @@ static int ehca_reg_bmap_mr_rpages(struct ehca_shca *shca,
                 ehca_err(&shca->ib_device, "kpage alloc failed");
                 return -ENOMEM;
         }
+        hret = H_SUCCESS;
         for (top = 0; top < EHCA_MAP_ENTRIES; top++) {
                 if (!ehca_bmap_valid(ehca_bmap->top[top]))
                         continue;