diff options
author | Joerg Roedel <jroedel@suse.de> | 2020-05-13 12:01:33 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2020-05-13 12:01:33 +0200 |
commit | ec9b40cffdb68c4ea1ebdcd1648ed6ce15c4449e (patch) | |
tree | 27b964f4377bf1ac712c118a6a3fb945476c7da6 /drivers/infiniband/sw/rdmavt/qp.c | |
parent | 3a0ce12e3b8e3cb7d54569a42aec743cc93f4f0d (diff) | |
parent | 0e698dfa282211e414076f9dc7e83c1c288314fd (diff) | |
download | linux-ec9b40cffdb68c4ea1ebdcd1648ed6ce15c4449e.tar.gz linux-ec9b40cffdb68c4ea1ebdcd1648ed6ce15c4449e.tar.bz2 linux-ec9b40cffdb68c4ea1ebdcd1648ed6ce15c4449e.zip |
Merge tag 'v5.7-rc4' into core
Linux 5.7-rc4
Diffstat (limited to 'drivers/infiniband/sw/rdmavt/qp.c')
-rw-r--r-- | drivers/infiniband/sw/rdmavt/qp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c index 0e1b291d2cec..500a7ee04c44 100644 --- a/drivers/infiniband/sw/rdmavt/qp.c +++ b/drivers/infiniband/sw/rdmavt/qp.c @@ -1244,8 +1244,8 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd, qp->ip = rvt_create_mmap_info(rdi, s, udata, qp->r_rq.wq); - if (!qp->ip) { - ret = ERR_PTR(-ENOMEM); + if (IS_ERR(qp->ip)) { + ret = ERR_CAST(qp->ip); goto bail_qpn; } |