lkml.org 
[lkml]   [2015]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 1/2] 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>

diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c
index e288996..bc2dccb 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]);

\
 
 \ /
  Last update: 2015-10-09 09:01    [W:0.046 / U:0.456 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site