From 7f32996e9faaefab0c751d04febe589efc2def30 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Mon, 4 Feb 2008 20:20:44 -0800 Subject: [PATCH] --- yaml --- r: 83251 b: refs/heads/master c: 2c78853472a36c7cf51a84a34edc370e21c93ce4 h: refs/heads/master i: 83249: a96cd30e6c064bb273f12ada538a85d92d0d2691 83247: 95bee72689337a85ae47a40008637ec95599c382 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_mr.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 90c3816bd7a7..ac3df75a7ab3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f33afc26dc03e6e0513e2e300f2aa0ad5463c2d2 +refs/heads/master: 2c78853472a36c7cf51a84a34edc370e21c93ce4 diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_mr.c b/trunk/drivers/infiniband/hw/mthca/mthca_mr.c index aa6c70a6a36f..3b6985557cb2 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_mr.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_mr.c @@ -613,8 +613,10 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd, sizeof *(mr->mem.tavor.mpt) * idx; mr->mtt = __mthca_alloc_mtt(dev, list_len, dev->mr_table.fmr_mtt_buddy); - if (IS_ERR(mr->mtt)) + if (IS_ERR(mr->mtt)) { + err = PTR_ERR(mr->mtt); goto err_out_table; + } mtt_seg = mr->mtt->first_seg * MTHCA_MTT_SEG_SIZE; @@ -627,8 +629,10 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd, mr->mem.tavor.mtts = dev->mr_table.tavor_fmr.mtt_base + mtt_seg; mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL); - if (IS_ERR(mailbox)) + if (IS_ERR(mailbox)) { + err = PTR_ERR(mailbox); goto err_out_free_mtt; + } mpt_entry = mailbox->buf;