* [patch -next] net: dwc-xlgmac: fix an error code in xlgmac_alloc_pages()
@ 2017-03-21 20:42 Dan Carpenter
2017-03-22 4:16 ` Jie Deng
2017-03-22 19:46 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2017-03-21 20:42 UTC (permalink / raw)
To: Jie Deng; +Cc: netdev, kernel-janitors
The dma_mapping_error() returns true if there is an error but we want
to return -ENOMEM and not 1.
Fixes: 65e0ace2c5cd ("net: dwc-xlgmac: Initial driver for DesignWare Enterprise Ethernet")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
index 55c796ed7d26..39b5cb967bba 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
@@ -335,7 +335,6 @@ static int xlgmac_alloc_pages(struct xlgmac_pdata *pdata,
{
struct page *pages = NULL;
dma_addr_t pages_dma;
- int ret;
/* Try to obtain pages, decreasing order if necessary */
gfp |= __GFP_COLD | __GFP_COMP | __GFP_NOWARN;
@@ -352,10 +351,9 @@ static int xlgmac_alloc_pages(struct xlgmac_pdata *pdata,
/* Map the pages */
pages_dma = dma_map_page(pdata->dev, pages, 0,
PAGE_SIZE << order, DMA_FROM_DEVICE);
- ret = dma_mapping_error(pdata->dev, pages_dma);
- if (ret) {
+ if (dma_mapping_error(pdata->dev, pages_dma)) {
put_page(pages);
- return ret;
+ return -ENOMEM;
}
pa->pages = pages;
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch -next] net: dwc-xlgmac: fix an error code in xlgmac_alloc_pages()
2017-03-21 20:42 [patch -next] net: dwc-xlgmac: fix an error code in xlgmac_alloc_pages() Dan Carpenter
@ 2017-03-22 4:16 ` Jie Deng
2017-03-22 19:46 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jie Deng @ 2017-03-22 4:16 UTC (permalink / raw)
To: Dan Carpenter, Jie Deng; +Cc: netdev, kernel-janitors
On 2017/3/22 4:42, Dan Carpenter wrote:
> The dma_mapping_error() returns true if there is an error but we want
> to return -ENOMEM and not 1.
>
> Fixes: 65e0ace2c5cd ("net: dwc-xlgmac: Initial driver for DesignWare Enterprise Ethernet")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
> index 55c796ed7d26..39b5cb967bba 100644
> --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
> +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
> @@ -335,7 +335,6 @@ static int xlgmac_alloc_pages(struct xlgmac_pdata *pdata,
> {
> struct page *pages = NULL;
> dma_addr_t pages_dma;
> - int ret;
>
> /* Try to obtain pages, decreasing order if necessary */
> gfp |= __GFP_COLD | __GFP_COMP | __GFP_NOWARN;
> @@ -352,10 +351,9 @@ static int xlgmac_alloc_pages(struct xlgmac_pdata *pdata,
> /* Map the pages */
> pages_dma = dma_map_page(pdata->dev, pages, 0,
> PAGE_SIZE << order, DMA_FROM_DEVICE);
> - ret = dma_mapping_error(pdata->dev, pages_dma);
> - if (ret) {
> + if (dma_mapping_error(pdata->dev, pages_dma)) {
> put_page(pages);
> - return ret;
> + return -ENOMEM;
> }
>
> pa->pages = pages;
Thanks for fixes.
Reviewed-by: Jie Deng <jiedeng@synopsys.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch -next] net: dwc-xlgmac: fix an error code in xlgmac_alloc_pages()
2017-03-21 20:42 [patch -next] net: dwc-xlgmac: fix an error code in xlgmac_alloc_pages() Dan Carpenter
2017-03-22 4:16 ` Jie Deng
@ 2017-03-22 19:46 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-03-22 19:46 UTC (permalink / raw)
To: dan.carpenter; +Cc: jiedeng, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 21 Mar 2017 23:42:27 +0300
> The dma_mapping_error() returns true if there is an error but we want
> to return -ENOMEM and not 1.
>
> Fixes: 65e0ace2c5cd ("net: dwc-xlgmac: Initial driver for DesignWare Enterprise Ethernet")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-22 19:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-21 20:42 [patch -next] net: dwc-xlgmac: fix an error code in xlgmac_alloc_pages() Dan Carpenter
2017-03-22 4:16 ` Jie Deng
2017-03-22 19:46 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).