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

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / usnic / usnic_ib_verbs.c

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index 756a83bcff58afbec6bc43f878a4a9a96b1aab98..5a0e26cd648e424d897af71aa9b48dfe70a1f5e1 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -442,12 +442,10 @@ int usnic_ib_query_gid(struct ib_device *ibdev, u32 port, int index,
 int usnic_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 {
        struct usnic_ib_pd *pd = to_upd(ibpd);
-       void *umem_pd;
 
-       umem_pd = pd->umem_pd = usnic_uiom_alloc_pd();
-       if (IS_ERR_OR_NULL(umem_pd)) {
-               return umem_pd ? PTR_ERR(umem_pd) : -ENOMEM;
-       }
+       pd->umem_pd = usnic_uiom_alloc_pd();
+       if (IS_ERR(pd->umem_pd))
+               return PTR_ERR(pd->umem_pd);
 
        return 0;
 }