Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6-block.git] / drivers / infiniband / hw / amso1100 / c2_intr.c

diff --git a/drivers/infiniband/hw/amso1100/c2_intr.c b/drivers/infiniband/hw/amso1100/c2_intr.c
index 0d0bc33ca30a6227b15f6ea26fc3527d9a8f8642..3b5095470cb3d37955cb24c101f8d07ac609432b 100644 (file)
--- 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,