diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-10-09 09:41:22 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-17 21:49:48 -0700 |
| commit | e426115e0ad35513d88a3e423b86f839b02f17b5 (patch) | |
| tree | c314ec326b069a4465d98758df922f138bdff900 /drivers/misc/mic/scif | |
| parent | ff65212cc4698f532c452a14fdb94a3b1d1f283d (diff) | |
| download | linux-e426115e0ad35513d88a3e423b86f839b02f17b5.tar.bz2 | |
misc: mic/scif: fix error code in scif_create_remote_lookup()
We should be returning -ENOMEM here instead of success.
Fixes: ba612aa8b487 ('misc: mic: SCIF memory registration and unregistration')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mic/scif')
| -rw-r--r-- | drivers/misc/mic/scif/scif_rma.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c index 980ef13b4cf6..8310b4dbff06 100644 --- a/drivers/misc/mic/scif/scif_rma.c +++ b/drivers/misc/mic/scif/scif_rma.c @@ -386,16 +386,20 @@ static int scif_create_remote_lookup(struct scif_dev *remote_dev, remote_dev, window->nr_lookup * sizeof(*window->dma_addr_lookup.lookup), GFP_KERNEL | __GFP_ZERO); - if (!window->dma_addr_lookup.lookup) + if (!window->dma_addr_lookup.lookup) { + err = -ENOMEM; goto error_window; + } window->num_pages_lookup.lookup = scif_alloc_coherent(&window->num_pages_lookup.offset, remote_dev, window->nr_lookup * sizeof(*window->num_pages_lookup.lookup), GFP_KERNEL | __GFP_ZERO); - if (!window->num_pages_lookup.lookup) + if (!window->num_pages_lookup.lookup) { + err = -ENOMEM; goto error_window; + } vmalloc_dma_phys = is_vmalloc_addr(&window->dma_addr[0]); vmalloc_num_pages = is_vmalloc_addr(&window->num_pages[0]); |