From 22481fd4e9ba32c80131518ebd3c3d5b46c99ac0 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 2 May 2012 09:13:57 +0300 Subject: [PATCH] --- yaml --- r: 302628 b: refs/heads/master c: 55a8d62a3bd2a0536d526da817fd4f49e6470770 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4f37d3c267a0..c6b392ec87bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e4d60a82e7ab4cd6e212b6834c6a48c79731957 +refs/heads/master: 55a8d62a3bd2a0536d526da817fd4f49e6470770 diff --git a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index eb55c80fa7d3..0d1872faa6ab 100644 --- a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -486,8 +486,8 @@ struct ib_mr *ocrdma_get_dma_mr(struct ib_pd *ibpd, int acc) struct ocrdma_mr *mr; mr = ocrdma_alloc_lkey(ibpd, acc, 0, OCRDMA_ADDR_CHECK_DISABLE); - if (!mr) - return ERR_PTR(-ENOMEM); + if (IS_ERR(mr)) + return ERR_CAST(mr); return &mr->ibmr; }