2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/amso1100/c2_cq.c b/drivers/infiniband/hw/amso1100/c2_cq.c
index d2b3366786d6..bb17cce3cb59 100644
--- a/drivers/infiniband/hw/amso1100/c2_cq.c
+++ b/drivers/infiniband/hw/amso1100/c2_cq.c
@@ -422,8 +422,8 @@ void c2_free_cq(struct c2_dev *c2dev, struct c2_cq *cq)
                 goto bail1;
 
         reply = (struct c2wr_cq_destroy_rep *) (unsigned long) (vq_req->reply_msg);
-
-        vq_repbuf_free(c2dev, reply);
+        if (reply)
+                vq_repbuf_free(c2dev, reply);
       bail1:
         vq_req_free(c2dev, vq_req);
       bail0:
diff --git a/drivers/infiniband/hw/amso1100/c2_intr.c b/drivers/infiniband/hw/amso1100/c2_intr.c
index 0d0bc33ca30a..3b5095470cb3 100644
--- a/drivers/infiniband/hw/amso1100/c2_intr.c
+++ b/drivers/infiniband/hw/amso1100/c2_intr.c
@@ -174,7 +174,11 @@ static void handle_vq(struct c2_dev *c2dev, u32 mq_index)
                 return;
         }
 
-        err = c2_errno(reply_msg);
+        if (reply_msg)
+                err = c2_errno(reply_msg);
+        else
+                err = -ENOMEM;
+
         if (!err) switch (req->event) {
         case IW_CM_EVENT_ESTABLISHED:
                 c2_set_qp_state(req->qp,