[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20151009064122.GC7540@mwanda>
Date: Fri, 9 Oct 2015 09:41:22 +0300
From: Dan Carpenter <dan.carpenter@...cle.com>
To: Nikhil Rao <nikhil.rao@...el.com>,
Sudeep Dutt <sudeep.dutt@...el.com>
Cc: Nikhil Rao <nikhil.rao@...el.com>,
Ashutosh Dixit <ashutosh.dixit@...el.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org
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@...cle.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]);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists