Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

[mv-sheeva.git] / drivers / infiniband / core / cma.c

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index d81c156a22b41b85ce727bd585376bed2345e903..671f137380549ada79c71f601022b209261d109f 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1289,7 +1289,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
        new_cm_id = rdma_create_id(listen_id->id.event_handler,
                                   listen_id->id.context,
                                   RDMA_PS_TCP);
-       if (!new_cm_id) {
+       if (IS_ERR(new_cm_id)) {
                ret = -ENOMEM;
                goto out;
        }