Patchwork [RFC,1/2] ixp4xx_eth: avoid calling dma_pool_create() with NULL dev

login
register
mail settings
Submitter Xi Wang
Date Nov. 18, 2012, 6:25 a.m.
Message ID <1353219910-24690-1-git-send-email-xi.wang@gmail.com>
Download mbox | patch
Permalink /patch/199893/
State Accepted
Delegated to: David Miller
Headers show

Comments

Xi Wang - Nov. 18, 2012, 6:25 a.m.
Use &port->netdev->dev instead of NULL since dma_pool_create() doesn't
allow NULL dev.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
See also
https://lkml.org/lkml/2012/11/14/11
---
 drivers/net/ethernet/xscale/ixp4xx_eth.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
David Miller - Nov. 20, 2012, 8:13 p.m.
From: Xi Wang <xi.wang@gmail.com>
Date: Sun, 18 Nov 2012 01:25:09 -0500

> Use &port->netdev->dev instead of NULL since dma_pool_create() doesn't
> allow NULL dev.
> 
> Signed-off-by: Xi Wang <xi.wang@gmail.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 98934bd..477d672 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -1102,10 +1102,12 @@  static int init_queues(struct port *port)
 {
 	int i;
 
-	if (!ports_open)
-		if (!(dma_pool = dma_pool_create(DRV_NAME, NULL,
-						 POOL_ALLOC_SIZE, 32, 0)))
+	if (!ports_open) {
+		dma_pool = dma_pool_create(DRV_NAME, &port->netdev->dev,
+					   POOL_ALLOC_SIZE, 32, 0);
+		if (!dma_pool)
 			return -ENOMEM;
+	}
 
 	if (!(port->desc_tab = dma_pool_alloc(dma_pool, GFP_KERNEL,
 					      &port->desc_tab_phys)))