Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / net / rds / ib_cm.c

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 8891822eba4f7fcd180ed54f34b83d587de367b3..c36d89cd14a10ec02b9c0708a468b244880dc9f0 100644 (file)
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -607,11 +607,11 @@ send_hdrs_dma_out:
 qp_out:
        rdma_destroy_qp(ic->i_cm_id);
 recv_cq_out:
-       if (!ib_destroy_cq(ic->i_recv_cq))
-               ic->i_recv_cq = NULL;
+       ib_destroy_cq(ic->i_recv_cq);
+       ic->i_recv_cq = NULL;
 send_cq_out:
-       if (!ib_destroy_cq(ic->i_send_cq))
-               ic->i_send_cq = NULL;
+       ib_destroy_cq(ic->i_send_cq);
+       ic->i_send_cq = NULL;
 rds_ibdev_out:
        rds_ib_remove_conn(rds_ibdev, conn);
 out: