diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-19 16:01:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-19 16:01:34 -0700 |
| commit | bcf77d5b596a4b812c71b306579c57a14cf03760 (patch) | |
| tree | 428572e849a6a40067bd32cadf6cbf4cf9429365 | |
| parent | eab814661945656d35d4a0e5870e932cd7139977 (diff) | |
| parent | 3c78658e26b3bbb29f646416f52f4b4d875de471 (diff) | |
Merge branch 'renesas-dma-channel'
Sergei Shtylyov says:
====================
Fix DMA channel misreporting for the Renesas Ethernet drivers
Here's a set of 2 patches against DaveM's 'net.git' repo fixing up the DMA
channel reporting by 'ifconfig'...
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 5349284203ff..8377d0220fa8 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1908,7 +1908,6 @@ static int ravb_probe(struct platform_device *pdev) /* The Ether-specific entries in the device structure. */ ndev->base_addr = res->start; - ndev->dma = -1; chip_id = (enum ravb_chip_id)of_device_get_match_data(&pdev->dev); diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 04cd39f66cc9..7bd910ce8b34 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2996,7 +2996,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) if (devno < 0) devno = 0; - ndev->dma = -1; ret = platform_get_irq(pdev, 0); if (ret < 0) goto out_release; |