diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 19:55:51 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 19:55:51 -0700 |
commit | 141769851cb73e8f986e9ed83129cde3b645288d (patch) | |
tree | 53bc1d8115e160df0ba1e315ca0ee7c858a01a53 /drivers/infiniband/hw/cxgb4/cq.c | |
parent | 1bb90cf0462c9a07cb428e9dd9665041fe7f9e18 (diff) | |
parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
download | linux-141769851cb73e8f986e9ed83129cde3b645288d.tar.gz linux-141769851cb73e8f986e9ed83129cde3b645288d.tar.bz2 linux-141769851cb73e8f986e9ed83129cde3b645288d.zip |
Merge 4.13-rc2 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/cq.c')
-rw-r--r-- | drivers/infiniband/hw/cxgb4/cq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c index e16fcaf6b5a3..be07da1997e6 100644 --- a/drivers/infiniband/hw/cxgb4/cq.c +++ b/drivers/infiniband/hw/cxgb4/cq.c @@ -963,6 +963,7 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, goto err3; if (ucontext) { + ret = -ENOMEM; mm = kmalloc(sizeof *mm, GFP_KERNEL); if (!mm) goto err4; |