Re: [PATCH 1/2] net: fec: use managed DMA API functions to allocate BD ring

2015-07-21 Thread David Miller
From: Lucas Stach l.st...@pengutronix.de
Date: Mon, 20 Jul 2015 15:51:37 +0200

 So it gets freed when the device is going away.
 This fixes a DMA memory leak on driver probe() fail and driver
 remove().
 
 Signed-off-by: Lucas Stach l.st...@pengutronix.de
 ---
  drivers/net/ethernet/freescale/fec_main.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/freescale/fec_main.c 
 b/drivers/net/ethernet/freescale/fec_main.c
 index 349365d85b92..b3287c6b069b 100644
 --- a/drivers/net/ethernet/freescale/fec_main.c
 +++ b/drivers/net/ethernet/freescale/fec_main.c
 @@ -3142,7 +3142,7 @@ static int fec_enet_init(struct net_device *ndev)
   fep-bufdesc_size;
  
   /* Allocate memory for buffer descriptors. */
 - cbd_base = dma_alloc_coherent(NULL, bd_size, bd_dma,
 + cbd_base = dmam_alloc_coherent(fep-pdev-dev, bd_size, bd_dma,
 GFP_KERNEL);

When you change the column of the openning parenthesis of a function call, you
must fix up the indentation of the second and subsequent lines so that they all
properly start at the first column after that openning parenthesis.
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 1/2] net: fec: use managed DMA API functions to allocate BD ring

2015-07-20 Thread Lucas Stach
So it gets freed when the device is going away.
This fixes a DMA memory leak on driver probe() fail and driver
remove().

Signed-off-by: Lucas Stach l.st...@pengutronix.de
---
 drivers/net/ethernet/freescale/fec_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c 
b/drivers/net/ethernet/freescale/fec_main.c
index 349365d85b92..b3287c6b069b 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3142,7 +3142,7 @@ static int fec_enet_init(struct net_device *ndev)
fep-bufdesc_size;
 
/* Allocate memory for buffer descriptors. */
-   cbd_base = dma_alloc_coherent(NULL, bd_size, bd_dma,
+   cbd_base = dmam_alloc_coherent(fep-pdev-dev, bd_size, bd_dma,
  GFP_KERNEL);
if (!cbd_base) {
return -ENOMEM;
-- 
2.1.4

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