From 107fbdd0700fc4e1273a949194b7c1b3bb03168d Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Sat, 17 Nov 2012 20:25:09 +0000 Subject: [PATCH] --- yaml --- r: 335851 b: refs/heads/master c: 1a4901177574083c35fafc24c4d151c2a7c7647c h: refs/heads/master i: 335849: 33d546bdccb78826c55a2413935b23b1150c0cda 335847: cb14c14373ccbad51216579acb851ff4299fbec2 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0d3654bf9987..1c94b8e8cac3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da9da01d9199b5bb15289d0859053c9aa3a34ac0 +refs/heads/master: 1a4901177574083c35fafc24c4d151c2a7c7647c diff --git a/trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c b/trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c index 98934bdf6acf..477d6729b17f 100644 --- a/trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/trunk/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)))