tree 12c5b9e7dde8bbe5731adfdca082512979a3173a
parent 817410e90f49c1202243b2cf78a7f121ce26a7b9
author Roland Dreier <[EMAIL PROTECTED]> Tue Apr 12 08:26:48 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:48 2005

[PATCH] IB/mthca: only free doorbell records in mem-free mode

On error path, only free doorbell records if we're in mem-free mode.

Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 mthca_cq.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: drivers/infiniband/hw/mthca/mthca_cq.c
===================================================================
--- 
f57d0863e95677bdf35054df2d7d75fd7924f7f5/drivers/infiniband/hw/mthca/mthca_cq.c 
 (mode:100644 sha1:7eb5425c2dffcc422234f1b12c1ebc766d551bf2)
+++ 
12c5b9e7dde8bbe5731adfdca082512979a3173a/drivers/infiniband/hw/mthca/mthca_cq.c 
 (mode:100644 sha1:25e3cf1bc43ae955efc0aa336c9264e8fdd4bf51)
@@ -817,10 +817,12 @@
 err_out_mailbox:
        kfree(mailbox);
 
-       mthca_free_db(dev, MTHCA_DB_TYPE_CQ_ARM, cq->arm_db_index);
+       if (dev->hca_type == ARBEL_NATIVE)
+               mthca_free_db(dev, MTHCA_DB_TYPE_CQ_ARM, cq->arm_db_index);
 
 err_out_ci:
-       mthca_free_db(dev, MTHCA_DB_TYPE_CQ_SET_CI, cq->set_ci_db_index);
+       if (dev->hca_type == ARBEL_NATIVE)
+               mthca_free_db(dev, MTHCA_DB_TYPE_CQ_SET_CI, 
cq->set_ci_db_index);
 
 err_out_icm:
        mthca_table_put(dev, dev->cq_table.table, cq->cqn);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to